diff -u -r --show-c-function --exclude-from=ffmf/.cvsignore ffmf.orig/config.mak.in ffmf/config.mak.in
--- ffmf.orig/config.mak.in	2004-01-28 22:37:11.000000000 +0100
+++ ffmf/config.mak.in	2004-01-29 08:34:48.000000000 +0100
@@ -23,8 +23,6 @@ TARGET_BUILTIN_VECTOR=yes
 HAVE_IMLIB2=no
 HAVE_FREETYPE2=no
 CONFIG_SDL=no
-# SDL_LIBS=-L/usr/lib -Wl,-rpath,/usr/lib -lSDL -lpthread
-# SDL_CFLAGS=-I/usr/include/SDL -D_REENTRANT
 EXTRALIBS=-lm -lz
 VERSION=0.4.8
 CONFIG_ENCODERS=yes
Only in ffmf.orig: configure
diff -u -r --show-c-function --exclude-from=ffmf/.cvsignore ffmf.orig/.cvsignore ffmf/.cvsignore
--- ffmf.orig/.cvsignore	2003-12-18 15:41:19.000000000 +0100
+++ ffmf/.cvsignore	2004-01-29 19:49:47.000000000 +0100
@@ -1,17 +1,5 @@
-aclocal.m4
-config.guess
-config.h.in
-config.sub
-configure
-COPYING
-depcomp
-INSTALL
-install-sh
-local.vim
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h.in
-cscope.out
-tags
-sources.lst
+*.o
+*.a
+config.mak
+*~
+
diff -u -r --show-c-function --exclude-from=ffmf/.cvsignore ffmf.orig/src/Makefile ffmf/src/Makefile
--- ffmf.orig/src/Makefile	2004-01-28 19:44:31.000000000 +0100
+++ ffmf/src/Makefile	2004-01-29 19:58:07.000000000 +0100
@@ -9,7 +9,7 @@ CFLAGS += -I. -I.. \
 	$(FFMPEG_CFLAGS) \
 	$(X_CFLAGS)
 
-LIBS  =  -lm -lOMC -lfl
+LIBS  =  -L/usr/local/lib -lm -lOMC -lfl
 GLIBS = `pkg-config glib-2.0 --libs gthread-2.0 gdk-2.0`
 XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXv
 FFLIBS = ../libavformat/libavformat.a ../libavcodec/libavcodec.a
@@ -39,6 +39,8 @@ playlist.o: xinemf.h playlist.h
 init.o: xinemf.h
 netosc.o: xinemf.h
 
+playlist-lexer.o: playlist-parser.o
+
 xinemf: $(XINEMF_OBJ) $(FFLIBS)
 	$(CC) $(XINEMF_OBJ) $(LDFLAGS) -o $@
 
diff -u -r --show-c-function --exclude-from=ffmf/.cvsignore ffmf.orig/src/netosc.c ffmf/src/netosc.c
--- ffmf.orig/src/netosc.c	2004-01-28 21:05:07.000000000 +0100
+++ ffmf/src/netosc.c	2004-01-29 20:15:38.000000000 +0100
@@ -312,14 +312,16 @@ void RMR_osc_start(RMR_config_t * config
     return;
   }
   
-  RMR_error("starting RMR_osc thread (%d).\n", config->listen_port);
+  RMR_debug("starting RMR_osc thread (%d).\n", config->listen_port);
   mutex = g_mutex_new();
   recv_thread = g_thread_create(RMR_osc_thread, 
 				NULL,
 				FALSE,
 				NULL);
-  if (!recv_thread)
+  if (!recv_thread) {
+    RMR_error("oops, OSC thread won't start!\n");
     close(sock);
+  }
 
 open_cue_targets:
   cue_targets = config->cue_targets;
@@ -340,6 +342,7 @@ open_cue_targets:
 				NULL);
     if (!cue_thread) {
       /* FIXME close all socks */
+      RMR_error("oops, cues thread won't start!\n");
     }
 
   }
diff -u -r --show-c-function --exclude-from=ffmf/.cvsignore ffmf.orig/src/playlist-lexer.l ffmf/src/playlist-lexer.l
--- ffmf.orig/src/playlist-lexer.l	2004-01-23 20:22:18.000000000 +0100
+++ ffmf/src/playlist-lexer.l	2004-01-29 19:42:00.000000000 +0100
@@ -9,7 +9,7 @@ typedef struct playlist_entry_t playlist
 typedef struct playlist_frame2cue_t playlist_frame2cue_t;
 typedef struct playlist_exit_t playlist_exit_t;
 typedef struct GList GList;
-#include "playlist-parser.h"
+#include "y.tab.h"
 %}
 
 %s parameters
Only in ffmf.orig/src: playlist-parser.h
Only in ffmf.orig/src: xinemf
diff -u -r --show-c-function --exclude-from=ffmf/.cvsignore ffmf.orig/src/xinemf.c ffmf/src/xinemf.c
--- ffmf.orig/src/xinemf.c	2004-01-28 22:01:37.000000000 +0100
+++ ffmf/src/xinemf.c	2004-01-30 00:58:36.000000000 +0100
@@ -135,7 +135,7 @@ void RMR_get_snap_ranges(int * sr1, int 
 
 static void update_playback_speed()
 {
-  set_playback_speed(received_speed*now_playing->nominal_speed);
+  set_playback_speed(received_speed / now_playing->nominal_speed);
 }
 
 static void play_entry(playlist_entry_t * entry)
@@ -372,6 +372,10 @@ static void check_events()
 	      play_entry(last_x);
 	      break;
 	    }
+	    /* 
+	     * no break here legally: if no last intersection - go
+	     * to the first movie 
+	     */
 	  case '1':
 	    play_entry(playlist_get_street1());
 	    break;
@@ -380,6 +384,7 @@ static void check_events()
 	    play_entry(playlist_get_i_movie());
 	    break;
 	}
+	break;
       case RMR_BRIGHTNESS:
 	brightness = (rec->brightness - 1.0)*100.0;
 	break;
@@ -408,7 +413,6 @@ static int jam_intersection_frame()
   int dy;
   
   if (snap_exit) {
-    check_events();
     
     /* check if past an exit */
     if (now_playing->cur_frame >= snap_exit->y2) {
@@ -485,6 +489,8 @@ static int jam_player_iteration()
   
   if (now_playing) {
 
+    check_events();
+
     if (jam_skip_current) {
       jam_player_follow();
       jam_skip_current = 0;
@@ -581,12 +587,17 @@ int main(int argc,char * argv[])
   av_register_all();
   av_log_set_level(0); /* not interested */
   
+  /* 
+   * has to parse BEFORE gdk init (to do --help without DISPLAY) 
+   * gdk heeft pech
+   */
+  RMR_parse_cmdline(argc,argv,&RMR_config);
+  RMR_set_verbosity(RMR_config.verbosity);
+  
   g_thread_init(NULL);
   gdk_threads_init();
   gdk_init(&argc,&argv);
   
-  RMR_parse_cmdline(argc,argv,&RMR_config);
-  RMR_set_verbosity(RMR_config.verbosity);
   /* my events queue FIXME ref with osc / unref at exit */
   RMR_events_queue = g_async_queue_new();
   RMR_osc_start(&RMR_config);
Only in ffmf/src: y.tab.h
Only in ffmf.orig: tags