diff options
| author | syrjala <syrjala@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-07 22:45:47 +0000 |
|---|---|---|
| committer | syrjala <syrjala@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-07 22:45:47 +0000 |
| commit | 0046a87017f0231f228683bbe0358ebf207f69a5 (patch) | |
| tree | 843a603f1d3b7a62b00224c01a0aea999beee05e /libvo | |
| parent | 883b0fad3ee9db7f2ff186f72291f34125552c6c (diff) | |
| download | mpv-0046a87017f0231f228683bbe0358ebf207f69a5.tar.bz2 mpv-0046a87017f0231f228683bbe0358ebf207f69a5.tar.xz | |
Clean up properly if preinit() fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14930 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_dfbmga.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index 835d2b8bfb..fef596f552 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -224,6 +224,8 @@ get_layer_by_name( DFBDisplayLayerID id, return DFENUM_OK; } +static void uninit( void ); + static uint32_t preinit( const char *arg ) { @@ -425,11 +427,13 @@ preinit( const char *arg ) if (l.res != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: Can't get primary layer - %s\n", DirectFBErrorString( l.res ) ); + uninit(); return -1; } if ((res = primary->SetCooperativeLevel( primary, DLSCL_EXCLUSIVE )) != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to primary layer - %s\n", DirectFBErrorString( res ) ); + uninit(); return -1; } use_input = 1; @@ -451,11 +455,13 @@ preinit( const char *arg ) if (l.res != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, "Can't get BES layer - %s\n", DirectFBErrorString( l.res ) ); + uninit(); return -1; } if ((res = bes->SetCooperativeLevel( bes, DLSCL_EXCLUSIVE )) != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to BES - %s\n", DirectFBErrorString( res ) ); + uninit(); return -1; } dlc.flags = DLCONF_PIXELFORMAT; @@ -481,11 +487,13 @@ preinit( const char *arg ) if (l.res != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, "Can't get CRTC2 layer - %s\n", DirectFBErrorString( l.res ) ); + uninit(); return -1; } if ((res = crtc2->SetCooperativeLevel( crtc2, DLSCL_EXCLUSIVE )) != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, "Can't get exclusive access to CRTC2 - %s\n", DirectFBErrorString( res ) ); + uninit(); return -1; } } @@ -495,10 +503,16 @@ preinit( const char *arg ) mp_msg( MSGT_VO, MSGL_ERR, "vo_dfbmga: Can't get keyboard - %s\n", DirectFBErrorString( res ) ); + uninit(); + return -1; + } + if ((res = keyboard->CreateEventBuffer( keyboard, &buffer )) != DFB_OK) { + mp_msg( MSGT_VO, MSGL_ERR, + "vo_dfbmga: Can't create event buffer - %s\n", + DirectFBErrorString( res ) ); + uninit(); return -1; } - keyboard->CreateEventBuffer( keyboard, &buffer ); - buffer->Reset( buffer ); } return 0; |