[vlc-commits] Remove old Nokia N900 hacks

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 23 10:33:12 2013 +0200| [e0de50a5fae465fb01a6591b2c256df925d4d68a] | committer: Rémi Denis-Courmont

Remove old Nokia N900 hacks

These were broken since 6270a4c777d849538b8a8e4d5c6f01fb96fa9ea9.

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

 bin/vlc.c                        |    2 +-
 configure.ac                     |    5 -----
 modules/codec/omxil/omxil.c      |    5 -----
 modules/text_renderer/freetype.c |    4 ----
 src/libvlc-module.c              |    8 +-------
 src/posix/thread.c               |    3 ---
 6 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 1588785..7e078e5 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -241,7 +241,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
 
     libvlc_add_intf (vlc, "hotkeys,none");
-#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__)
+#if !defined __APPLE__ && !defined (__OS2__)
     libvlc_add_intf (vlc, "globalhotkeys,none");
 #endif
 #ifdef HAVE_DBUS
diff --git a/configure.ac b/configure.ac
index 6eb50f3..c9666e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3888,11 +3888,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [
 ])
 
 
-AS_IF([test -f "/etc/maemo_version"], [
-  AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.])
-])
-
-
 dnl
 dnl Taglib plugin
 dnl
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 87be051..8adcb42 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -836,11 +836,6 @@ static int OpenDecoder( vlc_object_t *p_this )
     if( 0 || !GetOmxRole(p_dec->fmt_in.i_codec, p_dec->fmt_in.i_cat, false) )
         return VLC_EGENERIC;
 
-#ifdef HAVE_MAEMO
-    if( p_dec->fmt_in.i_cat != VIDEO_ES && !p_dec->b_force)
-        return VLC_EGENERIC;
-#endif
-
     status = OpenGeneric( p_this, false );
     if(status != VLC_SUCCESS) return status;
 
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index dd6faf3..7565375 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -61,10 +61,6 @@
 # define DEFAULT_FAMILY "Times New Roman WT K"
 # define DEFAULT_MONOSPACE_FONT_FILE "/psfonts/mtsansdk.ttf"
 # define DEFAULT_MONOSPACE_FAMILY "Monotype Sans Duospace WT K"
-#elif defined( HAVE_MAEMO )
-# define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
-# define DEFAULT_FAMILY "Nokia Sans Bold"
-# error Missing monospaced fonts
 #elif defined( __ANDROID__ )
 # define DEFAULT_FONT_FILE "/system/fonts/DroidSans-Bold.ttf"
 # define DEFAULT_FAMILY "Droid Sans Bold"
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 743546d..5c624a1 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1527,13 +1527,7 @@ vlc_module_begin ()
         change_safe ()
     add_bool( "grayscale", 0, GRAYSCALE_TEXT,
               GRAYSCALE_LONGTEXT, true )
-#if defined (HAVE_MAEMO)
-# define FULLSCREEN_DEFAULT true
-#else
-# define FULLSCREEN_DEFAULT false
-#endif
-    add_bool( "fullscreen", FULLSCREEN_DEFAULT, FULLSCREEN_TEXT,
-              FULLSCREEN_LONGTEXT, false )
+    add_bool( "fullscreen", false, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, false )
         change_short('f')
         change_safe ()
     add_bool( "embedded-video", 1, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
diff --git a/src/posix/thread.c b/src/posix/thread.c
index c414def..514f592 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -828,9 +828,6 @@ int vlc_set_priority (vlc_thread_t th, int priority)
 void vlc_cancel (vlc_thread_t thread_id)
 {
     pthread_cancel (thread_id);
-#ifdef HAVE_MAEMO
-    pthread_kill (thread_id, SIGRTMIN);
-#endif
 }
 
 /**