[Goodies-commits] r7688 - in parole/trunk: . data/interfaces po src
Ali Abdallah
aliov at xfce.org
Tue Jul 7 09:13:31 CEST 2009
Author: aliov
Date: 2009-07-07 07:13:31 +0000 (Tue, 07 Jul 2009)
New Revision: 7688
Modified:
parole/trunk/ChangeLog
parole/trunk/data/interfaces/playlist.ui
parole/trunk/po/POTFILES.in
parole/trunk/po/parole-media-player.pot
parole/trunk/src/filters.c
parole/trunk/src/gst.c
parole/trunk/src/main.c
parole/trunk/src/mediachooser.c
parole/trunk/src/mediafile.c
parole/trunk/src/medialist.c
parole/trunk/src/utils.c
parole/trunk/src/utils.h
Log:
* data/interfaces/playlist.ui disable media list horizontal scrolling.
* po/POTFILES.in fix missing strings in the interface files.
* src/gst.c apply the overlay at the correct time, the fix possible X
sync error when playing media files.
* src/mediafile.c check for error code for the unhandled Gfile info,
G_IO_ERROR_NOT_SUPPORTED occurs when we try to read info of an unsupported
location.
* src/filters.c sort media files that belong to the same dir only.
* src/main.c send media files by path instead of uri to the running
instance of the media player.
* src/medialist.c fix a bug adding folder contains media file.
from the command line.
* src/medialist.c Enable ellipsize of the text renderer.
Modified: parole/trunk/ChangeLog
===================================================================
--- parole/trunk/ChangeLog 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/ChangeLog 2009-07-07 07:13:31 UTC (rev 7688)
@@ -1,3 +1,18 @@
+2009-07-08 9:00 Ali aliov at xfce.org
+ * data/interfaces/playlist.ui disable media list horizontal scrolling.
+ * po/POTFILES.in fix missing strings in the interface files.
+ * src/gst.c apply the overlay at the correct time, the fix possible X
+ sync error when playing media files.
+ * src/mediafile.c check for error code for the unhandled Gfile info,
+ G_IO_ERROR_NOT_SUPPORTED occurs when we try to read info of an unsupported
+ location.
+ * src/filters.c sort media files that belong to the same dir only.
+ * src/main.c send media files by path instead of uri to the running
+ instance of the media player.
+ * src/medialist.c fix a bug adding folder contains media file.
+ from the command line.
+ * src/medialist.c Enable ellipsize of the text renderer.
+
2009-06-19: 13:00 Ali aliov at xfce.org
* Fix stupid bug causing a crash
when adding multiple media files to the list.
Modified: parole/trunk/data/interfaces/playlist.ui
===================================================================
--- parole/trunk/data/interfaces/playlist.ui 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/data/interfaces/playlist.ui 2009-07-07 07:13:31 UTC (rev 7688)
@@ -9,7 +9,7 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
+ <property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="media-list">
Modified: parole/trunk/po/POTFILES.in
===================================================================
--- parole/trunk/po/POTFILES.in 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/po/POTFILES.in 2009-07-07 07:13:31 UTC (rev 7688)
@@ -1,8 +1,9 @@
-data/interfaces/parole.ui
-data/interfaces/mediachooser.ui
-data/interfaces/playlist.ui
-data/interfaces/openlocation.ui
-data/interfaces/parole-settings.ui
+[encoding: UTF-8]
+[type: gettext/glade]data/interfaces/parole.ui
+[type: gettext/glade]data/interfaces/mediachooser.ui
+[type: gettext/glade]data/interfaces/playlist.ui
+[type: gettext/glade]data/interfaces/openlocation.ui
+[type: gettext/glade]data/interfaces/parole-settings.ui
data/desktop/parole.desktop.in.in
src/main.c
src/gst.c
Modified: parole/trunk/po/parole-media-player.pot
===================================================================
--- parole/trunk/po/parole-media-player.pot 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/po/parole-media-player.pot 2009-07-07 07:13:31 UTC (rev 7688)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-16 12:25+0200\n"
+"POT-Creation-Date: 2009-07-07 09:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,29 +16,121 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ../data/interfaces/parole.ui.h:1
+msgid "Albums"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:2
+msgid "Audio converter"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:3
+msgid "Audio recorder"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:4
+msgid "Media player"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:5
+msgid "Nothing yet."
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:6
+msgid "_Edit"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:7
+msgid "_File"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:8
+msgid "_Help"
+msgstr ""
+
+#: ../data/interfaces/parole.ui.h:9
+msgid "_View"
+msgstr ""
+
+#: ../data/interfaces/mediachooser.ui.h:1
+#: ../data/interfaces/openlocation.ui.h:2
+#: ../data/interfaces/parole-settings.ui.h:10
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/interfaces/openlocation.ui.h:1
+msgid "Open location of media file or live stream"
+msgstr ""
+
+#: ../data/interfaces/openlocation.ui.h:3
+msgid "gtk-open"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:1
+msgid "<b>Audio</b>"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:2
+msgid "<b>Display</b>"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:3
+msgid "<b>Subtitles</b>"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:4
+msgid "Automatically load subtitle when playing movie file"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:5
+msgid ""
+"Changing this will take effect after parole is restarted or a new media file "
+"is loaded."
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:6
+msgid "Enable visualization when playing audio file"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:7
+msgid "Encoding: "
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:8
+msgid "Font:"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:9
+msgid "Visualization type:"
+msgstr ""
+
+#: ../data/interfaces/parole-settings.ui.h:11
+msgid "gtk-help"
+msgstr ""
+
#: ../data/desktop/parole.desktop.in.in.h:1
msgid "Parole Media Player"
msgstr ""
-#: ../src/main.c:83
+#: ../src/main.c:97
msgid "Media to play"
msgstr ""
-#: ../src/main.c:99
+#: ../src/main.c:113
#, c-format
msgid "Type '%s --help' for usage."
msgstr ""
-#: ../src/gst.c:650
+#: ../src/gst.c:726
msgid "Error in changing state to ready"
msgstr ""
-#: ../src/gst.c:697
+#: ../src/gst.c:775
msgid ""
"Unable to load playbin GStreamer plugin, check your GStreamer installation"
msgstr ""
-#: ../src/gst.c:712
+#: ../src/gst.c:790
msgid ""
"Unable to load video GStreamer plugin, check your GStreamer installation"
msgstr ""
@@ -47,47 +139,47 @@
msgid "Check your Parole installation"
msgstr ""
-#: ../src/mediachooser.c:205
+#: ../src/mediachooser.c:197
msgid "Add media files"
msgstr ""
-#: ../src/mediachooser.c:205
+#: ../src/mediachooser.c:197
msgid "Open media file"
msgstr ""
-#: ../src/mediachooser.c:222
+#: ../src/mediachooser.c:214
msgid "Add"
msgstr ""
-#: ../src/mediachooser.c:222
+#: ../src/mediachooser.c:214
msgid "Open"
msgstr ""
-#: ../src/medialist.c:508
+#: ../src/medialist.c:503
msgid "Media list"
msgstr ""
-#: ../src/player.c:167
+#: ../src/player.c:171
msgid "Hide playlist"
msgstr ""
-#: ../src/player.c:176
+#: ../src/player.c:180
msgid "Show playlist"
msgstr ""
-#: ../src/player.c:309 ../src/statusbar.c:125 ../src/statusbar.c:127
+#: ../src/player.c:313 ../src/statusbar.c:125 ../src/statusbar.c:127
msgid "Playing"
msgstr ""
-#: ../src/player.c:310
+#: ../src/player.c:314
msgid "Media stream is not seekable"
msgstr ""
-#: ../src/player.c:328 ../src/player.c:341
+#: ../src/player.c:332 ../src/player.c:345
msgid "Paused"
msgstr ""
-#: ../src/player.c:359
+#: ../src/player.c:363
msgid "Stopped"
msgstr ""
@@ -108,14 +200,14 @@
msgid "Buffering"
msgstr ""
-#: ../src/filters.c:45
-msgid "Supported audio"
+#: ../src/filters.c:46
+msgid "Audio"
msgstr ""
-#: ../src/filters.c:63
-msgid "Supported video"
+#: ../src/filters.c:64
+msgid "Video"
msgstr ""
-#: ../src/filters.c:81
-msgid "Supported audio and video"
+#: ../src/filters.c:82
+msgid "Audio and video"
msgstr ""
Modified: parole/trunk/src/filters.c
===================================================================
--- parole/trunk/src/filters.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/filters.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -30,6 +30,7 @@
#include <glib.h>
#include "filters.h"
+#include "utils.h"
#include "data/mime/parole-mime-types.h"
/*
@@ -42,7 +43,7 @@
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Supported audio"));
+ gtk_file_filter_set_name (filter, _("Audio"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
@@ -60,7 +61,7 @@
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Supported video"));
+ gtk_file_filter_set_name (filter, _("Video"));
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
@@ -78,7 +79,7 @@
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Supported audio and video"));
+ gtk_file_filter_set_name (filter, _("Audio and video"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
@@ -107,10 +108,11 @@
void parole_get_media_files (GtkFileFilter *filter, const gchar *path, GSList **list)
{
+ GSList *list_internal = NULL;
GDir *dir;
const gchar *name;
ParoleMediaFile *file;
- TRACE ("path %s", path);
+
if ( g_file_test (path, G_FILE_TEST_IS_REGULAR ) )
{
file = parole_media_file_new (path);
@@ -137,12 +139,14 @@
{
file = parole_media_file_new (path_internal);
if ( parole_file_filter (filter, file) )
- *list = g_slist_append (*list, file);
+ list_internal = g_slist_append (list_internal, file);
else
g_object_unref (file);
}
g_free (path_internal);
}
+ list_internal = g_slist_sort (list_internal, (GCompareFunc) thunar_file_compare_by_name);
g_dir_close (dir);
+ *list = g_slist_concat (*list, list_internal);
}
}
Modified: parole/trunk/src/gst.c
===================================================================
--- parole/trunk/src/gst.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/gst.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -554,6 +554,9 @@
if ( gst->priv->target == new )
parole_gst_set_window_cursor (GTK_WIDGET (gst)->window, NULL);
+
+ if ( gst->priv->target == GST_STATE_PLAYING && pending >= GST_STATE_READY)
+ parole_gst_set_x_overlay (gst);
switch (gst->priv->state)
{
@@ -566,13 +569,10 @@
gst->priv->stream, PAROLE_MEDIA_STATE_PLAYING);
break;
case GST_STATE_PAUSED:
- if ( gst->priv->target == GST_STATE_PLAYING )
- parole_gst_set_x_overlay (gst);
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
gst->priv->stream, PAROLE_MEDIA_STATE_PAUSED);
break;
- default:
- {
+ case GST_STATE_READY:
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
gst->priv->stream, PAROLE_MEDIA_STATE_STOPPED);
@@ -588,7 +588,13 @@
{
parole_gst_draw_logo (gst);
}
- }
+ break;
+ case GST_STATE_NULL:
+ g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+ gst->priv->stream, PAROLE_MEDIA_STATE_STOPPED);
+ break;
+ default:
+ break;
}
}
Modified: parole/trunk/src/main.c
===================================================================
--- parole/trunk/src/main.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/main.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -50,18 +50,18 @@
GFile *file;
DBusGConnection *bus;
DBusGProxy *proxy;
- gchar **out_uris;
+ gchar **out_paths;
GError *error = NULL;
guint i;
bus = parole_g_session_bus_get ();
- out_uris = g_new (gchar *, g_strv_length (filenames));
+ out_paths = g_new (gchar *, g_strv_length (filenames));
for ( i = 0; filenames && filenames[i]; i++)
{
file = g_file_new_for_commandline_arg (filenames[i]);
- out_uris[i] = g_file_get_uri (file);
+ out_paths[i] = g_file_get_path (file);
g_object_unref (file);
}
@@ -71,7 +71,7 @@
PAROLE_DBUS_INTERFACE);
dbus_g_proxy_call (proxy, "AddFiles", &error,
- G_TYPE_STRV, out_uris,
+ G_TYPE_STRV, out_paths,
G_TYPE_INVALID,
G_TYPE_INVALID);
@@ -83,7 +83,7 @@
g_object_unref (proxy);
dbus_g_connection_unref (bus);
- g_strfreev (out_uris);
+ g_strfreev (out_paths);
}
int main (int argc, char **argv)
Modified: parole/trunk/src/mediachooser.c
===================================================================
--- parole/trunk/src/mediachooser.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/mediachooser.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -89,15 +89,6 @@
}
static void
-parole_media_chooser_sort_and_emit (ParoleMediaChooser *chooser, GSList **list)
-{
- TRACE ("Start");
- *list = g_slist_sort (*list, (GCompareFunc) thunar_file_compare_by_name);
-
- g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, *list);
-}
-
-static void
parole_media_chooser_add_many (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
{
GSList *files;
@@ -119,7 +110,7 @@
GSList *media_files = NULL;
file = g_slist_nth_data (files, i);
parole_get_media_files (filter, file, &media_files);
- parole_media_chooser_sort_and_emit (chooser, &media_files);
+ g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, media_files);
g_slist_free (media_files);
}
Modified: parole/trunk/src/mediafile.c
===================================================================
--- parole/trunk/src/mediafile.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/mediafile.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -134,11 +134,16 @@
if ( error )
{
-#ifdef DEBUG
- g_warning ("Unable to read file info %s :", error->message);
-#endif
- g_error_free (error);
- file->priv->display_name = g_file_get_basename (gfile);
+ if ( G_LIKELY (error->code == G_IO_ERROR_NOT_SUPPORTED) )
+ {
+ g_error_free (error);
+ file->priv->display_name = g_file_get_basename (gfile);
+ }
+ else
+ {
+ file->priv->display_name = g_strdup (file->priv->path);
+ }
+ g_warning ("Unable to read file info %s", error->message);
goto out;
}
Modified: parole/trunk/src/medialist.c
===================================================================
--- parole/trunk/src/medialist.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/medialist.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -199,7 +199,7 @@
}
static gboolean
-parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path)
+parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path, gboolean emit)
{
GSList *file_list = NULL;
GtkFileFilter *filter;
@@ -211,12 +211,11 @@
g_object_ref_sink (filter);
parole_get_media_files (filter, path, &file_list);
- file_list = g_slist_sort (file_list, (GCompareFunc) thunar_file_compare_by_name);
for ( len = 0; len < g_slist_length (file_list); len++)
{
file = g_slist_nth_data (file_list, len);
- parole_media_list_add (list, file, FALSE);
+ parole_media_list_add (list, file, len == 0 ? emit : FALSE);
ret = TRUE;
}
@@ -225,15 +224,6 @@
return ret;
}
-static void
-parole_media_list_add_by_uri (ParoleMediaList *list, const gchar *uri)
-{
- ParoleMediaFile *file;
- TRACE ("uri %s", uri);
- file = parole_media_file_new (uri);
- parole_media_list_add (list, file, FALSE);
-}
-
void parole_media_list_drag_data_received_cb (GtkWidget *widget,
GdkDragContext *drag_context,
gint x,
@@ -255,9 +245,9 @@
for ( i = 0; uri_list[i] != NULL; i++)
{
path = g_filename_from_uri (uri_list[i], NULL, NULL);
- if ( parole_media_list_add_by_path (list, path) )
+ if ( parole_media_list_add_by_path (list, path, i == 0 ? TRUE : FALSE) )
added++;
-
+
g_free (path);
}
@@ -503,8 +493,11 @@
renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start(col, renderer, FALSE);
- gtk_tree_view_column_set_attributes(col, renderer, "text", NAME_COL, NULL);
+ gtk_tree_view_column_pack_start (col, renderer, TRUE);
+ gtk_tree_view_column_set_attributes (col, renderer, "text", NAME_COL, NULL);
+ g_object_set (renderer,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list->priv->view), col);
gtk_tree_view_column_set_title (col, _("Media list"));
@@ -633,13 +626,7 @@
guint i;
for ( i = 0; filenames && filenames[i] != NULL; i++)
- {
- TRACE ("Adding file %s\n", filenames [i]);
- if ( g_str_has_prefix (filenames[i], "file:") )
- parole_media_list_add_by_uri (list, filenames[i]);
- else
- parole_media_list_add_by_path (list, filenames[i]);
- }
+ parole_media_list_add_by_path (list, filenames[i], i == 0 ? TRUE : FALSE);
}
static gboolean parole_media_list_dbus_add_files (ParoleMediaList *list,
Modified: parole/trunk/src/utils.c
===================================================================
--- parole/trunk/src/utils.c 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/utils.c 2009-07-07 07:13:31 UTC (rev 7688)
@@ -258,7 +258,7 @@
return (ac > bc) ? 1 : -1;
}
-static gchar *
+gchar *
parole_get_name_without_extension (const gchar *name)
{
guint len, suffix;
Modified: parole/trunk/src/utils.h
===================================================================
--- parole/trunk/src/utils.h 2009-07-07 04:56:44 UTC (rev 7687)
+++ parole/trunk/src/utils.h 2009-07-07 07:13:31 UTC (rev 7688)
@@ -33,7 +33,9 @@
gint thunar_file_compare_by_name (ParoleMediaFile *file_a,
ParoleMediaFile *file_b,
gboolean case_sensitive);
-
-gchar *parole_get_subtitle_path (const gchar *uri);
+gchar *parole_get_name_without_extension (const gchar *name)G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+gchar *parole_get_subtitle_path (const gchar *uri) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
#endif /* __PAROLE_UTILS_ */
More information about the Goodies-commits
mailing list