Use SDL output as default for iPaq.

diff --git a/ipkg/rules.gpe b/ipkg/rules.gpe
index c30fbb33cec6088aad28758a2442862666fd0d89..cabd8a970127b3de399d112882fa87438d5aeb6b 100755 (executable)
--- a/ipkg/rules.gpe
+++ b/ipkg/rules.gpe
@@ -34,11 +34,12 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
        --with-gtk-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \
        --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
-       --with-gpe-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \
        --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
 
+#  --with-gpe-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
+
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
 #export DESTDIR=/tmp/vlc

diff --git a/ipkg/vlc.gpe b/ipkg/vlc.gpe
index b3699f4d07dba46732719970780a18ba602d3208..34e17426355ab21149c9459c3928c935e2bb9e85 100755 (executable)
--- a/ipkg/vlc.gpe
+++ b/ipkg/vlc.gpe
@@ -3,7 +3,7 @@
  section="Graphics" \
  logtitle="VideoLAN Client" \
  title="VideoLAN Client" \
- command=vlc \
+ command="vlc -V sdl"\
  icon48=/usr/share/vlc/vlc48x48.png \
  windowtitle="VideoLAN Client"
 

diff --git a/modules/gui/familiar/familiar.c b/modules/gui/familiar/familiar.c
index e9b2c6739c403b2bde1cb19d2309d3cb75001eab..21443dca0ec50bcfca204283a49cd8c0bb6ed42f 100644 (file)
--- a/modules/gui/familiar/familiar.c
+++ b/modules/gui/familiar/familiar.c
@@ -2,7 +2,7 @@
  * familiar.c : familiar plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: familiar.c,v 1.20 2002/12/22 21:46:50 jpsaman Exp $
+ * $Id: familiar.c,v 1.21 2002/12/22 23:23:45 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -118,7 +118,7 @@ static void Close( vlc_object_t *p_this )
     }
 
 #ifdef NEED_GTK_MAIN
-    msg_Dbg( p_intf, "Releasin gtk_main" );
+    msg_Dbg( p_intf, "Releasing gtk_main" );
     module_Unneed( p_intf, p_intf->p_sys->p_gtk_main );
 #endif
 
@@ -225,8 +225,8 @@ static void Run( intf_thread_t *p_intf )
 
 #ifdef NEED_GTK_MAIN
     gdk_threads_leave();
-//#else
-//    gtk_main_quit();
+#else
+    gtk_main_quit();
 #endif
 }