Mercurial > mplayer.hg
comparison gui/interface.c @ 35626:c4954e899b5b
Relocate GTK initialization.
Initialize after X (i.e. lower level first).
| author | ib |
|---|---|
| date | Thu, 10 Jan 2013 10:47:17 +0000 |
| parents | 4188b70dc3ff |
| children | 51358e7bde85 |
comparison
equal
deleted
inserted
replaced
| 35625:4188b70dc3ff | 35626:c4954e899b5b |
|---|---|
| 104 gtkASS.enabled = ass_enabled; | 104 gtkASS.enabled = ass_enabled; |
| 105 gtkASS.use_margins = ass_use_margins; | 105 gtkASS.use_margins = ass_use_margins; |
| 106 gtkASS.top_margin = ass_top_margin; | 106 gtkASS.top_margin = ass_top_margin; |
| 107 gtkASS.bottom_margin = ass_bottom_margin; | 107 gtkASS.bottom_margin = ass_bottom_margin; |
| 108 | 108 |
| 109 gtkInit(); | |
| 110 | |
| 111 /* initialize X */ | 109 /* initialize X */ |
| 112 wsXInit(mDisplay); | 110 wsXInit(mDisplay); |
| 111 gtkInit(); | |
| 113 | 112 |
| 114 /* load skin */ | 113 /* load skin */ |
| 115 | 114 |
| 116 skinDirInHome = get_path("skins"); | 115 skinDirInHome = get_path("skins"); |
| 117 skinMPlayerDir = MPLAYER_DATADIR "/skins"; | 116 skinMPlayerDir = MPLAYER_DATADIR "/skins"; |