diff options
| author | lgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-31 22:32:58 +0000 |
|---|---|---|
| committer | lgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-31 22:32:58 +0000 |
| commit | f61ffa92b939a9e4c1dbe22a15e0398ea17c3075 (patch) | |
| tree | 68b27b581fced1a21cef5bf2c96c41a8d73dec8d /libvo/vo_xmga.c | |
| parent | d7f6f3e341ae2a53c82ec0056257f110c10fdb57 (diff) | |
| download | mpv-f61ffa92b939a9e4c1dbe22a15e0398ea17c3075.tar.bz2 mpv-f61ffa92b939a9e4c1dbe22a15e0398ea17c3075.tar.xz | |
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@923 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xmga.c')
| -rw-r--r-- | libvo/vo_xmga.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index 6a60cf29f5..f9c4dbce44 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -62,7 +62,7 @@ static vo_info_t vo_info = "" }; -static Display * mDisplay; +//static Display * mDisplay; static Window mWindow; static GC mGC; static XGCValues wGCV; @@ -225,17 +225,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ if ( X_already_started ) return -1; - vo_init(); - - if ( getenv( "DISPLAY" ) ) name=getenv( "DISPLAY" ); - mDisplay=XOpenDisplay(name); - if ( mDisplay == NULL ) - { - printf( "Can not open X11 display\n" ); - return -1; - } - - mScreen=DefaultScreen( mDisplay ); + if (!vo_init()) return -1; mvWidth=width; mvHeight=height; |