[gcompris/gcompris-9-6-1: 6/8] Minor, replaced g_warning by g_message to ease debugging.



commit b4653b6b9f7518d4ee9ea4b64df607fc6913a274
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Mar 27 18:17:09 2011 +0200

    Minor, replaced g_warning by g_message to ease debugging.

 src/gcompris/gstreamer.c |   16 ++++++++--------
 src/gcompris/soundutil.c |   14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/gcompris/gstreamer.c b/src/gcompris/gstreamer.c
index 659ccc1..6d9eb22 100644
--- a/src/gcompris/gstreamer.c
+++ b/src/gcompris/gstreamer.c
@@ -69,12 +69,12 @@ fx_bus(GstBus* bus, GstMessage* msg, gpointer data)
   switch( GST_MESSAGE_TYPE( msg ) )
     {
     case GST_MESSAGE_EOS:
-      g_warning("fx_bus: EOS START");
+      g_debug("fx_bus: EOS START");
       gc_sound_fx_close();
       /* holds GStreamer locks */
       g_idle_add(run_sound_callback, data);
       fx_play();
-      g_warning("fx_bus: EOS END");
+      g_debug("fx_bus: EOS END");
       break;
     default:
       return TRUE;
@@ -88,7 +88,7 @@ bg_bus(GstBus* bus, GstMessage* msg, gpointer data)
 {
   switch( GST_MESSAGE_TYPE( msg ) ) {
     case GST_MESSAGE_EOS:
-        g_warning("bg_bus: EOS");
+        g_debug("bg_bus: EOS");
 	gc_sound_bg_close();
 	bg_play(NULL);
 	break;
@@ -112,14 +112,14 @@ gc_sound_bg_close()
 void
 gc_sound_fx_close()
 {
-  g_warning("gc_sound_fx_close");
+  g_debug("gc_sound_fx_close");
   if (fx_pipeline)
     {
       gst_element_set_state(fx_pipeline, GST_STATE_NULL);
       gst_object_unref(GST_OBJECT(fx_pipeline));
       fx_pipeline = NULL;
     }
-  g_warning("gc_sound_fx_close done");
+  g_debug("gc_sound_fx_close done");
 }
 
 void
@@ -204,7 +204,7 @@ bg_play(gpointer dummy)
 
   gchar *uri = g_strconcat("file://", absolute_file, NULL);
   g_free(absolute_file);
-  g_warning("  bg_play %s", uri);
+  g_debug("  bg_play %s", uri);
 
   g_object_set (G_OBJECT (bg_pipeline), "uri", uri, NULL);
 
@@ -233,7 +233,7 @@ fx_play()
   if(!file)
     return;
 
-  g_warning("  fx_play %s", file);
+  g_debug("  fx_play %s", file);
 
   absolute_file = gc_file_find_absolute(file);
 
@@ -252,7 +252,7 @@ fx_play()
 
   gchar *uri = g_strconcat("file://", absolute_file, NULL);
   g_free(absolute_file);
-  g_warning("   uri '%s'", uri);
+  g_debug("   uri '%s'", uri);
 
   g_object_set (G_OBJECT (fx_pipeline), "uri", uri, NULL);
   gst_bus_add_watch (gst_pipeline_get_bus (GST_PIPELINE (fx_pipeline)),
diff --git a/src/gcompris/soundutil.c b/src/gcompris/soundutil.c
index 105ed1b..2a71a2b 100644
--- a/src/gcompris/soundutil.c
+++ b/src/gcompris/soundutil.c
@@ -103,7 +103,7 @@ gc_sound_build_music_list()
   dir = g_dir_open(music_dir, 0, NULL);
 
   if (!dir) {
-    g_warning ("Couldn't open music dir: %s", music_dir);
+    g_message ("Couldn't open music dir: %s", music_dir);
     g_free(music_dir);
     return;
   }
@@ -142,7 +142,7 @@ get_next_sound_to_play( )
     {
       tmpSound = g_list_nth_data( pending_queue, 0 );
       pending_queue = g_list_remove( pending_queue, tmpSound );
-      g_warning( "... get_next_sound_to_play : %s\n", tmpSound );
+      g_debug( "... get_next_sound_to_play : %s\n", tmpSound );
     }
 
   return tmpSound;
@@ -193,7 +193,7 @@ gc_sound_play_ogg(const gchar *sound, ...)
 
   list = g_list_append(list, (gpointer)sound);
 
-  g_warning("Adding %s in the play list queue\n", sound);
+  g_debug("Adding %s in the play list queue\n", sound);
 
   va_start( ap, sound);
   while( (tmp = va_arg (ap, char *)))
@@ -232,7 +232,7 @@ gc_sound_play_ogg_list( GList* files )
     while ( g_list_length(pending_queue) > 0 )
     {
       tmpSound = g_list_nth_data( pending_queue, 0 );
-      g_warning("removing queue file (%s)", tmpSound);
+      g_debug("removing queue file (%s)", tmpSound);
       pending_queue = g_list_remove( pending_queue, tmpSound );
       gc_sound_callback(tmpSound);
     }
@@ -245,7 +245,7 @@ gc_sound_play_ogg_list( GList* files )
 	{
 	  pending_queue = g_list_append(pending_queue,
 					g_strdup( (gchar*)(list->data) ));
-	  g_warning("adding queue file (%s)", (gchar*)(list->data));
+	  g_debug("adding queue file (%s)", (gchar*)(list->data));
 	}
       list = g_list_next(list);
     }
@@ -306,11 +306,11 @@ void gc_sound_callback(gchar *file)
 
   if (cb)
     {
-      g_warning("calling callback for %s", file);
+      g_debug("calling callback for %s", file);
       cb(file);
     }
   else
-    g_warning("%s has no callback", file);
+    g_debug("%s has no callback", file);
 
   g_hash_table_remove(sound_callbacks, file);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]