[vlc-devel] commit: OMAP framebuffer: remove Maemo screen blanking code ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 26 13:42:25 2009 +0300| [2646299fe8f3a09cfe2bb25e547bbe4dcf5cbe5e] | committer: Rémi Denis-Courmont 

OMAP framebuffer: remove Maemo screen blanking code

This slows down the video output thread too much, and does not belong in
the video output plugin anyway. It should go to the screensaver.
(I have also have a patch to move it to xcb_window if someone wants it).

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

 configure.ac                  |    4 +-
 modules/video_output/omapfb.c |   47 -----------------------------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8e092bd..04ed319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4950,8 +4950,8 @@ 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 omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
-    VLC_ADD_LIBS([xvmc glx omapfb],[-losso])
+    VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+    VLC_ADD_LIBS([xvmc glx],[-losso])
  ])
 ])
 AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c
index 78ab2e8..3a1c7f3 100644
--- a/modules/video_output/omapfb.c
+++ b/modules/video_output/omapfb.c
@@ -41,10 +41,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#ifdef HAVE_OSSO
-#include <libosso.h>
-#endif
-
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
@@ -74,10 +70,6 @@ static int  InitWindow       ( vout_thread_t * );
 static void CreateWindow     ( vout_sys_t * );
 static void ToggleFullScreen ( vout_thread_t * );
 
-#ifdef HAVE_OSSO
-static const int i_backlight_on_interval = 300;
-#endif
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -165,11 +157,6 @@ struct vout_sys_t
     /* Dummy memory */
     int        i_null_fd;
     uint8_t   *p_null;
-
-#ifdef HAVE_OSSO
-    osso_context_t      *p_octx;
-    int                 i_backlight_on_counter;
-#endif
 };
 
 /*****************************************************************************
@@ -211,16 +198,6 @@ static int Create( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#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
-
     return VLC_SUCCESS;
 }
 
@@ -241,13 +218,6 @@ static void Destroy( vlc_object_t *p_this )
         XCloseDisplay( p_vout->p_sys->p_display );
     }
 
-#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
-
     /* Destroy structure */
     free( p_vout->p_sys );
 }
@@ -439,23 +409,6 @@ static int Manage( vout_thread_t *p_vout )
             return VLC_EGENERIC;
         }
     }
-
-
-#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 VLC_SUCCESS;
 }