[xine-cvs] CVS: xine-ui/src/aaui main.c,1.10,1.11

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/xine-ui/src/aaui
In directory usw-pr-cvs1:/tmp/cvs-serv18385/src/aaui

Modified Files:
	main.c 
Log Message:
timer output and advanced seeking methods implemented

Index: main.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/aaui/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- main.c	2001/08/22 15:52:37	1.10
+++ main.c	2001/09/01 14:34:02	1.11
@@ -155,7 +155,7 @@
     aaxine.current_mrl++;
    
     if (aaxine.current_mrl < aaxine.num_mrls)
-      xine_play (aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0 );
+      xine_play (aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0, 0 );
     else
       aaxine.current_mrl--;
 
@@ -190,7 +190,7 @@
 static void set_position (int pos) {
 
   aaxine.ignore_status = 1;
-  xine_seek(aaxine.xine, aaxine.mrl[aaxine.current_mrl], pos);
+  xine_play(aaxine.xine, aaxine.mrl[aaxine.current_mrl], pos, 0);
   aaxine.ignore_status = 0;
 }
 
@@ -501,7 +501,7 @@
    * ui loop
    */
 
-  xine_play (aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0);
+  xine_play (aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0, 0);
 
   running = 1;
 
@@ -519,7 +519,7 @@
       xine_stop(aaxine.xine);
       aaxine.current_mrl--;
       if((aaxine.current_mrl >= 0) && (aaxine.current_mrl < aaxine.num_mrls)) {
-	xine_play(aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0);
+	xine_play(aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0, 0);
       } 
       else {
 	aaxine.current_mrl = 0;
@@ -560,13 +560,16 @@
     case 13:
     case 'r':
     case 'R':
-      xine_play (aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0);
+      xine_play (aaxine.xine, aaxine.mrl[aaxine.current_mrl], 0, 0);
       break;
 
     case ' ':
     case 'p':
     case 'P':
-      xine_pause (aaxine.xine);
+      if (xine_get_speed (aaxine.xine) != SPEED_PAUSE)
+	xine_set_speed(aaxine.xine, SPEED_PAUSE);
+      else
+	xine_set_speed(aaxine.xine, SPEED_NORMAL);
       break;
 
     case 's':