Commit 4369204a authored by Rémi Denis-Courmont's avatar 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.
parent 95ec28fb
...@@ -4979,13 +4979,7 @@ fi ...@@ -4979,13 +4979,7 @@ fi
AC_LANG_POP(C++) AC_LANG_POP(C++)
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
dnl Tests for Osso and Xsp dnl Tests for 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])
])
])
AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[ AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP]) VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP])
VLC_ADD_LIBS([xvmc glx],[-lXsp]) VLC_ADD_LIBS([xvmc glx],[-lXsp])
......
...@@ -127,10 +127,6 @@ static void EnablePixelDoubling( vout_thread_t *p_vout ); ...@@ -127,10 +127,6 @@ static void EnablePixelDoubling( vout_thread_t *p_vout );
static void DisablePixelDoubling( vout_thread_t *p_vout ); static void DisablePixelDoubling( vout_thread_t *p_vout );
#endif #endif
#ifdef HAVE_OSSO
static const int i_backlight_on_interval = 300;
#endif
/***************************************************************************** /*****************************************************************************
...@@ -399,16 +395,6 @@ int Activate ( vlc_object_t *p_this ) ...@@ -399,16 +395,6 @@ int Activate ( vlc_object_t *p_this )
p_vout->p_sys->i_hw_scale = 1; p_vout->p_sys->i_hw_scale = 1;
#endif #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 */ /* Variable to indicate if the window should be on top of others */
/* Trigger a callback right now */ /* Trigger a callback right now */
var_TriggerCallback( p_vout, "video-on-top" ); var_TriggerCallback( p_vout, "video-on-top" );
...@@ -465,13 +451,6 @@ void Deactivate ( vlc_object_t *p_this ) ...@@ -465,13 +451,6 @@ void Deactivate ( vlc_object_t *p_this )
free_context_lock( &p_vout->p_sys->xvmc_lock ); free_context_lock( &p_vout->p_sys->xvmc_lock );
#endif #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 ); free( p_vout->p_sys );
} }
...@@ -1329,20 +1308,6 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1329,20 +1308,6 @@ static int ManageVideo( vout_thread_t *p_vout )
xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
#endif #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; return 0;
} }
...@@ -2237,13 +2202,8 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event ) ...@@ -2237,13 +2202,8 @@ static int X11ErrorHandler( Display * display, XErrorEvent * event )
} }
#endif #endif
#ifndef HAVE_OSSO
XSetErrorHandler(NULL); XSetErrorHandler(NULL);
return (XSetErrorHandler(X11ErrorHandler))( display, event ); return (XSetErrorHandler(X11ErrorHandler))( display, event );
#else
/* Work-around Maemo Xvideo bug */
return 0;
#endif
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -51,10 +51,6 @@ ...@@ -51,10 +51,6 @@
VLC_FOURCC( i & 0xff, (i >> 8) & 0xff, (i >> 16) & 0xff, \ VLC_FOURCC( i & 0xff, (i >> 8) & 0xff, (i >> 16) & 0xff, \
(i >> 24) & 0xff ) (i >> 24) & 0xff )
#ifdef HAVE_OSSO
#include <libosso.h>
#endif
struct vout_window_t; struct vout_window_t;
/***************************************************************************** /*****************************************************************************
...@@ -308,11 +304,6 @@ struct vout_sys_t ...@@ -308,11 +304,6 @@ struct vout_sys_t
#ifdef HAVE_XSP #ifdef HAVE_XSP
int i_hw_scale; int i_hw_scale;
#endif #endif
#ifdef HAVE_OSSO
osso_context_t *p_octx;
int i_backlight_on_counter;
#endif
}; };
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment