[vlc-devel] commit: Remove old libosso support ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 18 15:24:16 2009 +0300| [4369204a580b837270b9be13dae4797896cc0387] | committer: Rémi Denis-Courmont 

Remove old libosso support

Anyway, Maemo does not support XvMC, and our GLX plugin won't work
either. Also, calling D-Bus from the video output thread was causing
visible latencies in with the former Xlib/Xv plugin.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4369204a580b837270b9be13dae4797896cc0387
---

 configure.ac                       |    8 +------
 modules/video_output/x11/xcommon.c |   40 ------------------------------------
 modules/video_output/x11/xcommon.h |    9 --------
 3 files changed, 1 insertions(+), 56 deletions(-)

diff --git a/configure.ac b/configure.ac
index dfb2cfd..83d70bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4979,13 +4979,7 @@ fi
 AC_LANG_POP(C++)
 AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 
-dnl Tests for Osso and Xsp
-AC_CHECK_LIB(osso, osso_display_blanking_pause, [
-  PKG_CHECK_MODULES(GLIB2, glib-2.0, [
-    VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
-    VLC_ADD_LIBS([xvmc glx],[-losso])
- ])
-])
+dnl Tests for Xsp
 AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
   VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP])
   VLC_ADD_LIBS([xvmc glx],[-lXsp])
diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 0879a5b..b72f127 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -127,10 +127,6 @@ static void EnablePixelDoubling( vout_thread_t *p_vout );
 static void DisablePixelDoubling( vout_thread_t *p_vout );
 #endif
 
-#ifdef HAVE_OSSO
-static const int i_backlight_on_interval = 300;
-#endif
-
 
 
 /*****************************************************************************
@@ -399,16 +395,6 @@ int Activate ( vlc_object_t *p_this )
     p_vout->p_sys->i_hw_scale = 1;
 #endif
 
-#ifdef HAVE_OSSO
-    p_vout->p_sys->i_backlight_on_counter = i_backlight_on_interval;
-    p_vout->p_sys->p_octx = osso_initialize( "vlc", VERSION, 0, NULL );
-    if ( p_vout->p_sys->p_octx == NULL ) {
-        msg_Err( p_vout, "Could not get osso context" );
-    } else {
-        msg_Dbg( p_vout, "Initialized osso context" );
-    }
-#endif
-
     /* Variable to indicate if the window should be on top of others */
     /* Trigger a callback right now */
     var_TriggerCallback( p_vout, "video-on-top" );
@@ -465,13 +451,6 @@ void Deactivate ( vlc_object_t *p_this )
     free_context_lock( &p_vout->p_sys->xvmc_lock );
 #endif
 
-#ifdef HAVE_OSSO
-    if ( p_vout->p_sys->p_octx != NULL ) {
-        msg_Dbg( p_vout, "Deinitializing osso context" );
-        osso_deinitialize( p_vout->p_sys->p_octx );
-    }
-#endif
-
     free( p_vout->p_sys );
 }
 
@@ -1329,20 +1308,6 @@ static int ManageVideo( vout_thread_t *p_vout )
     xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
 #endif
 
-#ifdef HAVE_OSSO
-    if ( p_vout->p_sys->p_octx != NULL ) {
-        if ( p_vout->p_sys->i_backlight_on_counter == i_backlight_on_interval ) {
-            if ( osso_display_blanking_pause( p_vout->p_sys->p_octx ) != OSSO_OK ) {
-                msg_Err( p_vout, "Could not disable backlight blanking" );
-        } else {
-                msg_Dbg( p_vout, "Backlight blanking disabled" );
-            }
-            p_vout->p_sys->i_backlight_on_counter = 0;
-        } else {
-            p_vout->p_sys->i_backlight_on_counter ++;
-        }
-    }
-#endif
     return 0;
 }
 
@@ -2237,13 +2202,8 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event )
     }
 #endif
 
-#ifndef HAVE_OSSO
     XSetErrorHandler(NULL);
     return (XSetErrorHandler(X11ErrorHandler))( display, event );
-#else
-    /* Work-around Maemo Xvideo bug */
-    return 0;
-#endif
 }
 
 /*****************************************************************************
diff --git a/modules/video_output/x11/xcommon.h b/modules/video_output/x11/xcommon.h
index 0cd58ff..461cc2a 100644
--- a/modules/video_output/x11/xcommon.h
+++ b/modules/video_output/x11/xcommon.h
@@ -51,10 +51,6 @@
         VLC_FOURCC( i & 0xff, (i >> 8) & 0xff, (i >> 16) & 0xff, \
                     (i >> 24) & 0xff )
 
-#ifdef HAVE_OSSO
-#include <libosso.h>
-#endif
-
 struct vout_window_t;
 
 /*****************************************************************************
@@ -308,11 +304,6 @@ struct vout_sys_t
 #ifdef HAVE_XSP
     int                 i_hw_scale;
 #endif
-
-#ifdef HAVE_OSSO
-    osso_context_t      *p_octx;
-    int                 i_backlight_on_counter;
-#endif
 };
 
 /*****************************************************************************