From fdc4300ae0cd7f5aa059d81d6667edbbed207476 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 12 Feb 2019 17:21:18 +0100 Subject: [PATCH 1/2] audio-video-properties: Add context to "Unknown" strings See https://gitlab.gnome.org/GNOME/totem/issues/299 --- .../bacon-video-widget-properties.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/audio-video-properties/bacon-video-widget-properties.c b/extensions/audio-video-properties/bacon-video-widget-properties.c index d5621b676b..f8f6b7d3d7 100644 --- a/extensions/audio-video-properties/bacon-video-widget-properties.c +++ b/extensions/audio-video-properties/bacon-video-widget-properties.c @@ -101,19 +101,19 @@ bacon_video_widget_properties_reset (BaconVideoWidgetProperties *props) gtk_widget_set_sensitive (item, FALSE); /* Title */ - bacon_video_widget_properties_set_label (props, "title", _("Unknown")); + bacon_video_widget_properties_set_label (props, "title", C_("Title", "Unknown")); /* Artist */ - bacon_video_widget_properties_set_label (props, "artist", _("Unknown")); + bacon_video_widget_properties_set_label (props, "artist", C_("Artist", "Unknown")); /* Album */ - bacon_video_widget_properties_set_label (props, "album", _("Unknown")); + bacon_video_widget_properties_set_label (props, "album", C_("Album", "Unknown")); /* Year */ - bacon_video_widget_properties_set_label (props, "year", _("Unknown")); + bacon_video_widget_properties_set_label (props, "year", C_("Year", "Unknown")); /* Duration */ bacon_video_widget_properties_set_duration (props, 0); /* Comment */ bacon_video_widget_properties_set_label (props, "comment", ""); /* Container */ - bacon_video_widget_properties_set_label (props, "container", _("Unknown")); + bacon_video_widget_properties_set_label (props, "container", C_("Media container", "Unknown")); /* Dimensions */ bacon_video_widget_properties_set_label (props, "dimensions", C_("Dimensions", "N/A")); -- GitLab From 3096d7e544514d9f505a4fa0acb1814a45867461 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 11 Feb 2019 18:02:06 +0100 Subject: [PATCH 2/2] audio-video-properties: Make the framerate more precise Add a bit more precision to the frames per second property. Closes: #901 --- .../bacon-video-widget-properties.c | 8 +++----- .../bacon-video-widget-properties.h | 2 +- extensions/audio-video-properties/totem-properties-view.c | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/extensions/audio-video-properties/bacon-video-widget-properties.c b/extensions/audio-video-properties/bacon-video-widget-properties.c index f8f6b7d3d7..88d62636be 100644 --- a/extensions/audio-video-properties/bacon-video-widget-properties.c +++ b/extensions/audio-video-properties/bacon-video-widget-properties.c @@ -222,17 +222,15 @@ bacon_video_widget_properties_set_has_type (BaconVideoWidgetProperties *props, void bacon_video_widget_properties_set_framerate (BaconVideoWidgetProperties *props, - int framerate) + float framerate) { gchar *temp; g_return_if_fail (props != NULL); g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props)); - /* The FPS has to be done differently because it's a plural string */ - if (framerate != 0) { - temp = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d frame per second", "%d frames per second", framerate), - framerate); + if (framerate > 1.0) { + temp = g_strdup_printf ("%0.2f frames per second", framerate); } else { temp = g_strdup (C_("Frame rate", "N/A")); } diff --git a/extensions/audio-video-properties/bacon-video-widget-properties.h b/extensions/audio-video-properties/bacon-video-widget-properties.h index cef7e53e94..32ec5e0b8d 100644 --- a/extensions/audio-video-properties/bacon-video-widget-properties.h +++ b/extensions/audio-video-properties/bacon-video-widget-properties.h @@ -57,6 +57,6 @@ void bacon_video_widget_properties_set_has_type (BaconVideoWidgetProperties *pr gboolean has_video, gboolean has_audio); void bacon_video_widget_properties_set_framerate (BaconVideoWidgetProperties *props, - int framerate); + float framerate); #endif /* BACON_VIDEO_WIDGET_PROPERTIES_H */ diff --git a/extensions/audio-video-properties/totem-properties-view.c b/extensions/audio-video-properties/totem-properties-view.c index eb8bcf00b3..af50be0608 100644 --- a/extensions/audio-video-properties/totem-properties-view.c +++ b/extensions/audio-video-properties/totem-properties-view.c @@ -191,11 +191,11 @@ update_video (TotemPropertiesView *props, /* Round up/down to the nearest integer framerate */ fps_n = gst_discoverer_video_info_get_framerate_num (info); fps_d = gst_discoverer_video_info_get_framerate_denom (info); - if (fps_d == 0) - bacon_video_widget_properties_set_framerate (props->priv->props, 0); - else + if (fps_d > 0.0) bacon_video_widget_properties_set_framerate (props->priv->props, - (fps_n + fps_d/2) / fps_d); + (float) fps_n / (float) fps_d); + else + bacon_video_widget_properties_set_framerate (props->priv->props, 0.0); } static void -- GitLab