diff --git a/gst/parole-gst.c b/gst/parole-gst.c index 2a51a35..d9d6fda 100644 --- a/gst/parole-gst.c +++ b/gst/parole-gst.c @@ -138,7 +138,7 @@ parole_gst_finalize (GObject *object) gst = PAROLE_GST (object); - TRACE ("start"); + g_debug ("start"); if ( gst->priv->tick_id != 0) g_source_remove (gst->priv->tick_id); @@ -159,7 +159,7 @@ parole_gst_finalize (GObject *object) static void parole_gst_set_window_cursor (GdkWindow *window, GdkCursor *cursor) { - TRACE ("start"); + g_debug ("start"); if ( window ) gdk_window_set_cursor (window, cursor); } @@ -323,7 +323,7 @@ parole_gst_get_video_output_size (ParoleGst *gst, gint *ret_w, gint *ret_h) *ret_w = (guint) gst_util_uint64_scale (video_h, dar_n, dar_d); *ret_h = video_w; } - TRACE ("Got best video size %dx%d fraction, %d/%d\n", *ret_w, *ret_h, disp_par_n, disp_par_d); + g_debug ("Got best video size %dx%d fraction, %d/%d\n", *ret_w, *ret_h, disp_par_n, disp_par_d); } } } @@ -469,7 +469,7 @@ parole_gst_set_video_color_balance (ParoleGstHelper *helper) "saturation", &saturation_value, NULL); - TRACE ("Setting video color balance"); + g_debug ("Setting video color balance"); g_object_set (G_OBJECT (video_sink), "brightness", brightness_value, @@ -520,7 +520,7 @@ parole_gst_expose_event (GtkWidget *widget, GdkEventExpose *ev) parole_gst_set_x_overlay (gst); - TRACE ("EXPOSE event state=%d target=%d", gst->priv->state, gst->priv->target); + g_debug ("EXPOSE event state=%d target=%d", gst->priv->state, gst->priv->target); switch ( gst->priv->state ) { @@ -655,7 +655,7 @@ parole_gst_query_duration (ParoleGst *gst) duration = absolute_duration / GST_SECOND; live = ( absolute_duration == 0 ); - TRACE ("Duration %lld is_live=%d", duration, live); + g_debug ("Duration %" G_GINT64_FORMAT "is_live=%d", duration, live); g_object_set (G_OBJECT (gst->priv->stream), "absolute-duration", absolute_duration, @@ -677,7 +677,7 @@ parole_gst_set_subtitle_font (ParoleGstHelper *helper) "subtitle-font", &font, NULL); - TRACE ("Setting subtitle font %s\n", font); + g_debug ("Setting subtitle font %s\n", font); g_object_set (G_OBJECT (gst->priv->playbin), "subtitle-font-desc", font, @@ -737,7 +737,7 @@ parole_gst_load_subtitle (ParoleGstHelper *helper) if ( sub ) { - TRACE ("Found subtitle with path %s", sub); + g_debug ("Found subtitle with path %s", sub); sub_uri = g_filename_to_uri (sub, NULL, NULL); g_object_set (G_OBJECT (gst->priv->playbin), "suburi", sub_uri, @@ -770,7 +770,7 @@ parole_gst_get_pad_capabilities (GObject *object, GParamSpec *pspec, ParoleGst * { gst_structure_get_int (st, "width", &width); gst_structure_get_int (st, "height", &height); - TRACE ("Caps width=%d height=%d\n", width, height); + g_debug ("Caps width=%d height=%d\n", width, height); g_object_set (G_OBJECT (gst->priv->stream), "video-width", width, @@ -839,7 +839,7 @@ parole_gst_query_info (ParoleGst *gst) } g_object_unref (pad); } - TRACE ("Stream has video"); + g_debug ("Stream has video"); g_object_set (G_OBJECT (gst->priv->stream), "has-video", TRUE, NULL); @@ -848,7 +848,7 @@ parole_gst_query_info (ParoleGst *gst) if ( g_ascii_strcasecmp (val->value_name, "audio") == 0 || g_ascii_strcasecmp (val->value_nick, "audio") == 0) { - TRACE ("Stream has audio"); + g_debug ("Stream has audio"); g_object_set (G_OBJECT (gst->priv->stream), "has-audio", TRUE, NULL); @@ -862,7 +862,7 @@ parole_gst_query_info (ParoleGst *gst) static void parole_gst_update_stream_info (ParoleGst *gst) { - TRACE ("Updating stream info"); + g_debug ("Updating stream info"); parole_gst_query_info (gst); } @@ -874,14 +874,14 @@ parole_gst_update_vis (ParoleGstHelper *helper) gst = PAROLE_GST (helper); - TRACE ("start"); + g_debug ("start"); g_object_get (G_OBJECT (gst->priv->conf), "vis-enabled", &gst->priv->with_vis, "vis-name", &vis_name, NULL); - TRACE ("Vis name %s enabled %d\n", vis_name, gst->priv->with_vis); + g_debug ("Vis name %s enabled %d\n", vis_name, gst->priv->with_vis); if ( gst->priv->with_vis ) { @@ -900,13 +900,13 @@ parole_gst_update_vis (ParoleGstHelper *helper) gst->priv->update_vis = FALSE; g_free (vis_name); - TRACE ("end"); + g_debug ("end"); } static void parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState pending) { - TRACE ("State change new %i old %i pending %i", new, old, pending); + g_debug ("State change new %i old %i pending %i", new, old, pending); gst->priv->state = new; @@ -1019,7 +1019,7 @@ parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList *tag) "num-tracks", num_tracks, "track", track, NULL); - TRACE ("num_tracks=%i track=%i", num_tracks, track); + g_debug ("num_tracks=%i track=%i", num_tracks, track); g_signal_emit (G_OBJECT (gst), signals [MEDIA_TAG], 0, gst->priv->stream); } } @@ -1032,7 +1032,7 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst, GstTagList *tag) if ( gst_tag_list_get_string_index (tag, GST_TAG_TITLE, 0, &str) ) { - TRACE ("title:%s", str); + g_debug ("title:%s", str); g_object_set (G_OBJECT (gst->priv->stream), "title", str, NULL); @@ -1041,7 +1041,7 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst, GstTagList *tag) if ( gst_tag_list_get_string_index (tag, GST_TAG_ARTIST, 0, &str) ) { - TRACE ("artist:%s", str); + g_debug ("artist:%s", str); g_object_set (G_OBJECT (gst->priv->stream), "artist", str, NULL); @@ -1052,7 +1052,7 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst, GstTagList *tag) { str = g_strdup_printf ("%d", g_date_get_year (date)); - TRACE ("year:%s", str); + g_debug ("year:%s", str); g_object_set (G_OBJECT (gst->priv->stream), "year", str, @@ -1063,7 +1063,7 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst, GstTagList *tag) if ( gst_tag_list_get_string_index (tag, GST_TAG_ALBUM, 0, &str) ) { - TRACE ("album:%s", str); + g_debug ("album:%s", str); g_object_set (G_OBJECT (gst->priv->stream), "album", str, NULL); @@ -1072,7 +1072,7 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst, GstTagList *tag) if ( gst_tag_list_get_string_index (tag, GST_TAG_COMMENT, 0, &str) ) { - TRACE ("comment:%s", str); + g_debug ("comment:%s", str); g_object_set (G_OBJECT (gst->priv->stream), "comment", str, NULL); @@ -1119,7 +1119,7 @@ parole_gst_application_message (ParoleGst *gst, GstMessage *msg) if ( !name ) return; - TRACE ("Application message : %s", name); + g_debug ("Application message : %s", name); if ( !g_strcmp0 (name, "notify-streaminfo") ) { @@ -1145,7 +1145,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) ParoleMediaType media_type; gint current_track; - TRACE ("End of stream"); + g_debug ("End of stream"); g_object_get (G_OBJECT (gst->priv->stream), "media-type", &media_type, @@ -1158,7 +1158,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) "track", ¤t_track, NULL); - TRACE ("Current track %d Number of tracks %d", current_track, num_tracks); + g_debug ("Current track %d Number of tracks %d", current_track, num_tracks); if ( num_tracks != current_track ) { parole_gst_seek_cdda_track (gst, current_track); @@ -1180,7 +1180,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) gst->priv->buffering = FALSE; parole_gst_change_state (gst, GST_STATE_NULL); gst_message_parse_error (msg, &error, &debug); - TRACE ("*** ERROR %s : %s ***", error->message, debug); + g_debug ("*** ERROR %s : %s ***", error->message, debug); g_signal_emit (G_OBJECT (gst), signals [ERROR], 0, error->message); g_error_free (error); g_free (debug); @@ -1191,7 +1191,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) { gint per = 0; gst_message_parse_buffering (msg, &per); - TRACE ("Buffering %d %%", per); + g_debug ("Buffering %d %%", per); g_signal_emit (G_OBJECT (gst), signals [BUFFERING], 0, gst->priv->stream, per); @@ -1213,7 +1213,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) if ( gst->priv->enable_tags ) { GstTagList *tag_list; - TRACE ("Tag message:"); + g_debug ("Tag message:"); gst_message_parse_tag (msg, &tag_list); parole_gst_get_meta_data (gst, tag_list); gst_tag_list_free (tag_list); @@ -1224,7 +1224,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) parole_gst_application_message (gst, msg); break; case GST_MESSAGE_DURATION: - TRACE ("Duration message"); + g_debug ("Duration message"); parole_gst_query_duration (gst); break; case GST_MESSAGE_ELEMENT: @@ -1232,10 +1232,10 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) case GST_MESSAGE_WARNING: break; case GST_MESSAGE_INFO: - TRACE ("Info message:"); + g_debug ("Info message:"); break; case GST_MESSAGE_STATE_DIRTY: - TRACE ("Stream is dirty"); + g_debug ("Stream is dirty"); break; case GST_MESSAGE_STEP_DONE: break; @@ -1248,7 +1248,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data) case GST_MESSAGE_STRUCTURE_CHANGE: break; case GST_MESSAGE_STREAM_STATUS: - TRACE ("Stream status"); + g_debug ("Stream status"); break; case GST_MESSAGE_SEGMENT_START: break; @@ -1269,7 +1269,7 @@ parole_gst_change_state (ParoleGst *gst, GstState new) { GstStateChangeReturn ret; - TRACE ("Changing state to %d", new); + g_debug ("Changing state to %d", new); ret = gst_element_set_state (GST_ELEMENT (gst->priv->playbin), new); @@ -1282,14 +1282,14 @@ parole_gst_change_state (ParoleGst *gst, GstState new) GST_STATE_PENDING (gst->priv->playbin)); break; case GST_STATE_CHANGE_ASYNC: - TRACE ("State will change async"); + g_debug ("State will change async"); break; case GST_STATE_CHANGE_FAILURE: - TRACE ("Error will be handled async"); + g_debug ("Error will be handled async"); break; case GST_STATE_CHANGE_NO_PREROLL: - TRACE ("State change no_preroll"); + g_debug ("State change no_preroll"); break; default: break; @@ -1300,7 +1300,7 @@ static void parole_gst_stream_info_notify_cb (GObject * obj, GParamSpec * pspec, ParoleGst *gst) { GstMessage *msg; - TRACE ("Stream info changed"); + g_debug ("Stream info changed"); msg = gst_message_new_application (GST_OBJECT (gst->priv->playbin), gst_structure_new ("notify-streaminfo", NULL)); gst_element_post_message (gst->priv->playbin, msg); @@ -1332,11 +1332,11 @@ parole_gst_play_file_internal (ParoleGst *gst) { gchar *uri; - TRACE ("Start"); + g_debug ("Start"); if ( G_UNLIKELY (GST_STATE (gst->priv->playbin) == GST_STATE_PLAYING ) ) { - TRACE ("*** Error *** This is a bug, playbin element is already playing"); + g_debug ("*** Error *** This is a bug, playbin element is already playing"); } if ( gst->priv->update_vis) @@ -1348,7 +1348,7 @@ parole_gst_play_file_internal (ParoleGst *gst) "uri", &uri, NULL); - TRACE ("Processing uri : %s", uri); + g_debug ("Processing uri : %s", uri); g_object_set (G_OBJECT (gst->priv->playbin), "uri", uri, @@ -1433,7 +1433,7 @@ parole_gst_button_release_event (GtkWidget *widget, GdkEventButton *ev) static void parole_gst_seek_cdda_track (ParoleGst *gst, gint track) { - TRACE ("Track %d", track); + g_debug ("Track %d", track); if ( !gst_element_seek (gst->priv->playbin, 1.0, gst_format_get_by_nick ("track"), GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, @@ -1503,7 +1503,7 @@ parole_gst_check_state_change_timeout (gpointer data) gst = PAROLE_GST (data); - TRACE ("target =%d current state=%d", gst->priv->target, gst->priv->state); + g_debug ("target =%d current state=%d", gst->priv->target, gst->priv->state); if ( gst->priv->state != gst->priv->target ) { @@ -1764,7 +1764,7 @@ parole_gst_constructed (GObject *object) parole_gst_helper_set_subtitle_encoding (PAROLE_GST_HELPER (gst)); parole_gst_helper_set_subtitle_font (PAROLE_GST_HELPER (gst)); - TRACE ("End"); + g_debug ("End"); } static void @@ -1987,7 +1987,7 @@ void parole_gst_play_device_uri (ParoleGst *gst, const gchar *uri, const gchar * { const gchar *local_uri = NULL; - TRACE ("device : %s", device); + g_debug ("device : %s", device); if ( gst->priv->device ) { @@ -2074,7 +2074,7 @@ void parole_gst_seek (ParoleGst *gst, gdouble pos) gint64 duration; gboolean seekable; - TRACE ("Seeking"); + g_debug ("Seeking"); g_object_get (G_OBJECT (gst->priv->stream), "absolute-duration", &absolute_duration, @@ -2169,7 +2169,7 @@ gint parole_gst_get_current_cdda_track (ParoleGst *gst) if ( gst_element_query_position (gst->priv->playbin, &format, &pos) ) { - TRACE ("Pos %lld", pos); + g_debug ("Pos %" G_GINT64_FORMAT, pos); ret_val = (gint) pos; }