[Toxine-cvs] CVS: toxine/src commands.c,1.76,1.77 main.c,1.37,1.38 xine_commands.c,1.48,1.49

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24642

Modified Files:
	commands.c main.c xine_commands.c 
Log Message:
@@fix watchdog and X11 vop. show all xine_play() calls.

Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- commands.c	30 May 2004 23:24:56 -0000	1.76
+++ commands.c	31 May 2004 20:37:05 -0000	1.77
@@ -550,7 +550,7 @@
   }
 
   if(tox->display_events) {
-    pinfo("Get xine event:\n");
+    pinfo("Got xine event:\n");
     poutalign();
     for(i = 0; event_struct[i].name != NULL; i++) {
       if(event_struct[i].event == tox->event.last.type) {
@@ -1412,12 +1412,14 @@
   pos = atoi((toxine_get_arg(tox, 1)));
   
   start_watchdog(tox, "xine_play");
+  pinfo("xine_play(%d, 0):\n", pos);
   result = xine_play(tox->stream, pos, 0);
   stop_watchdog(tox);
   if(!result) {
     perr("xine_play() failed.\n");
     error_code_set(tox, TOX_ERR_XINE_PLAY);
   }
+  pinfo(".\n");
   
 }
 
@@ -1451,12 +1453,14 @@
     msec = 0;
 
   start_watchdog(tox, "xine_play");
+  pinfo("xine_play(0, %d)\n", msec);
   result = xine_play(tox->stream, 0, msec);
   stop_watchdog(tox);
   if(!result) {
     perr("xine_play() failed.\n");
     error_code_set(tox, TOX_ERR_XINE_PLAY);
   }
+  pinfo(".\n");
 }
 
 /*

Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- main.c	30 May 2004 23:22:39 -0000	1.37
+++ main.c	31 May 2004 20:37:05 -0000	1.38
@@ -116,12 +116,13 @@
   while(tox->running) {
     
     if(tox->watchdog.enabled) {
+
       if(i % 2) {
-	
+
 	if(tox->watchdog.running) {
 	  long int        timeout;
 	  struct timeval  tv, tvd;
-	  
+
 	  pthread_mutex_lock(&tox->watchdog.mutex);
 	  
 	  gettimeofday(&tv, NULL);

Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xine_commands.c	30 May 2004 22:25:05 -0000	1.48
+++ xine_commands.c	31 May 2004 20:37:05 -0000	1.49
@@ -358,8 +358,8 @@
     pinfo("  entry->type: XINE_CONFIG_TYPE_STRING\n");
     pinfo("  entry->str_value: '%s'\n", entry->str_value);
     pinfo("  entry->str_default: '%s'\n", entry->str_default);
-			  //    if(tox)
-			  //      toxine_set_last_char_result(tox, entry->str_value);
+    if(tox)
+      toxine_set_last_char_result(tox, entry->str_value);
     break;
     
   case XINE_CONFIG_TYPE_RANGE:
@@ -368,8 +368,8 @@
     pinfo("  entry->num_default: '%d'\n", entry->num_default);
     pinfo("  entry->range_min: '%d'\n", entry->range_min);
     pinfo("  entry->range_max: '%d'\n", entry->range_max);
-    //    if(tox)
-      //      toxine_set_last_int_result(tox, entry->num_value);
+    if(tox)
+      toxine_set_last_int_result(tox, entry->num_value);
     break;
     
   case XINE_CONFIG_TYPE_ENUM:
@@ -380,8 +380,8 @@
       int i;
       pinfo("  entry->enum_values: ");
 
-      //      if(tox)
-      //	toxine_set_last_achar_result(tox, (const char* const*)entry->enum_values);
+      if(tox)
+      	toxine_set_last_achar_result(tox, (const char* const*)entry->enum_values);
 
       for(i = 0; entry->enum_values[i]; i++)
 	pout("'%s' ", entry->enum_values[i]);
@@ -394,16 +394,16 @@
     pinfo("  entry->type: XINE_CONFIG_TYPE_NUM\n");
     pinfo("  entry->num_value: '%d'\n", entry->num_value);
     pinfo("  entry->num_default: '%d'\n", entry->num_default);
-			  //    if(tox)
-      //      toxine_set_last_int_result(tox, entry->num_value);
+    if(tox)
+      toxine_set_last_int_result(tox, entry->num_value);
     break;
     
   case XINE_CONFIG_TYPE_BOOL:
     pinfo("  entry->type: XINE_CONFIG_TYPE_BOOL\n");
     pinfo("  entry->num_value: '%d'\n", entry->num_value);
     pinfo("  entry->num_default: '%d'\n", entry->num_default);
-			  //    if(tox)
-			  //      toxine_set_last_int_result(tox, entry->num_value);
+    if(tox)
+      toxine_set_last_int_result(tox, entry->num_value);
     break;
     
   case XINE_CONFIG_TYPE_UNKNOWN: