[Xfce4-commits] Make mirror button insensitive if not possible
Updating branch refs/heads/master
to 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e (commit)
from 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
commit 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e
Author: Sean Davis
Date: Wed Dec 11 10:56:51 2013 +
Make mirror button insensitive if not possible
Signed-off-by: Sean Davis
dialogs/display-settings/main.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0789517..a6f90a2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1869,6 +1869,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
GObject*only_display1, *only_display2, *mirror_displays;
GObject*extend_right, *advanced, *fake_button, *label;
GError *error = NULL;
+RRMode mode;
builder = gtk_builder_new ();
@@ -1911,6 +1912,12 @@ display_settings_show_minimal_dialog (GdkDisplay
*display)
gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr->friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr->mode[1] != None);
+
+/* Can outputs be cloned? */
+if (display_settings_get_n_active_outputs () > 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode !=
None);
if (xfce_randr->mode[0] != None && xfce_randr->mode[1] != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Show/hide display popups with focus
Updating branch refs/heads/master
to 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit)
from 8f95e0836365e62d052cc000f3b7a0145cd2c81c (commit)
commit 3e3106903d3d2cc877390c3ff438bfe957fb1e77
Author: Sean Davis
Date: Tue Dec 10 10:32:22 2013 +
Show/hide display popups with focus
Signed-off-by: Sean Davis
dialogs/display-settings/main.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6dcfc5b..8c706db 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1707,6 +1707,35 @@ screen_on_event (GdkXEvent *xevent,
}
static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (&iter, display_popups);
+while (g_hash_table_iter_next (&iter, &key, &value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE);
+return TRUE;
+}
+
+static void
display_settings_show_main_dialog (GdkDisplay *display)
{
GtkBuilder *builder;
@@ -1729,6 +1758,10 @@ display_settings_show_main_dialog (GdkDisplay *display)
randr_event_base,
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+/* Show/Hide the helper popups when the dialog is shown/hidden */
+g_signal_connect(G_OBJECT(dialog), "focus-out-event", G_CALLBACK
(focus_out_event), builder);
+g_signal_connect(G_OBJECT(dialog), "focus-in-event", G_CALLBACK
(focus_in_event), builder);
if (G_UNLIKELY (opt_socket_id == 0))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Identify Displays button
Updating branch refs/heads/master
to 18af539c96d36b5464901b12f528768478b898fd (commit)
from 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit)
commit 18af539c96d36b5464901b12f528768478b898fd
Author: Sean Davis
Date: Wed Dec 11 02:36:52 2013 +
Identify Displays button
Signed-off-by: Sean Davis
dialogs/display-settings/display-dialog.glade | 40 +++---
dialogs/display-settings/main.c | 71 ++---
2 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index b4bbd80..db7fcef 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -273,14 +273,40 @@
True
False
-
-Configure _new
displays when connected
+
True
-True
-False
-False
-True
-True
+False
+
+
+Configure
_new displays when connected
+True
+True
+False
+False
+True
+True
+
+
+False
+True
+0
+
+
+
+
+Identify
Displays
+True
+True
+True
+False
+
+
+False
+True
+end
+1
+
+
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8c706db..b48c9e9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -154,6 +154,7 @@ static gint randr_event_base;
/* Used to identify the display */
static GHashTable *display_popups;
+gboolean show_popups = FALSE;
gboolean supports_alpha = FALSE;
@@ -1440,6 +1441,42 @@ display_settings_dialog_response (GtkDialog *dialog,
gtk_main_quit ();
}
+static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (&iter, display_popups);
+while (g_hash_table_iter_next (&iter, &key, &value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE && show_popups);
+return TRUE;
+}
+
+static void
+on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder)
+{
+show_popups = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+set_display_popups_visible (show_popups);
+}
+
static GtkWidget *
@@ -1449,7 +1486,7 @@ display_settings_dialog_new (GtkBuilder *builder)
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
GObject *combobox;
-GObject *label, *check, *mirror;
+GObject *label, *check, *mirror, *identify;
/* Get the treeview */
treeview = gtk_builder_get_object (builder, "randr-outputs");
@@ -1467,6 +1504,9 @@ display_settings_dialog_new (GtkBuilder *builder)
/* Identification popups */
display_setting_identity_popups_populate ();
+identify = gtk_builder_get_object (builder, "identify-displays");
+g_signal_connect (G_OBJECT (identify), "toggled", G_CALLBACK
(on_identify_displays_toggled), builder);
+set_display_popups_visible (show_popups);
/* Treeview selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
@@ -1707,35 +1747,6 @@ screen_on_event (GdkXEvent *xevent,
}
static void
-set_display_popups_visible(gboolean visible)
-{
-GHashTableIter iter;
-gpointer key, value;
-GtkWidget *popup;
-
-g_hash_table_iter_init (&iter, display_popups);
-while (g_hash_table_iter_next (&iter, &key, &value))
-{
-popup = (GtkWidget *) value;
-gtk_widget_set_visible(popup, visible);
-}
-}
-
-static gboolean
-focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-set_display_popups_visible(FALS
[Xfce4-commits] Add hotplug checkbox to plug dialog
Updating branch refs/heads/master to 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit) from 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit) commit 3c2a9784feea5f9cd549e5b5b1167aad453eb839 Author: Sean Davis Date: Wed Dec 11 02:13:34 2013 + Add hotplug checkbox to plug dialog Signed-off-by: Sean Davis dialogs/display-settings/display-dialog.glade | 454 + 1 file changed, 232 insertions(+), 222 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index db0dcf5..b4bbd80 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -18,241 +18,275 @@ False 2 - + True False 12 -12 +6 - -200 -True -True -automatic -automatic -etched-in - - -True -True -False -False -False - - - - -True -True -0 - - - - + True False -7 -2 -12 -6 - - -False - - -1 -2 -6 -7 -GTK_FILL - - - - -True -False - - -1 -2 -5 -6 -GTK_FILL - - - - -True -False - - -1 -2 -4 -5 -GTK_FILL - - - - -True -False - - -1 -2 -3 -4 -GTK_FILL - - - - -False -0 -Ref_lection: -True - - -6 -7 -GTK_FILL -GTK_FILL - - - - -True -False -0 -Ro_tation: -True - - -5 -6 -GTK_FILL -GTK_FILL - - - - -True -False -0 -Refresh _rate: -True - - -4 -5 -GTK_FILL -GTK_FILL - - - - -True -False -0 -R_esolution: -True - - -3 -4 -GTK_FILL -GTK_FILL - - - - -True -False -0 -P_osition: -True - - -2 -3 -GTK_FILL -GTK_FILL - - +12 - -_Use this output + +200 True True -False -False -True -True - - -2 -GTK_FILL -GTK_FILL - - - - -_Mirror
[Xfce4-commits] Fix display mirroring
Updating branch refs/heads/master
to 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
from 18af539c96d36b5464901b12f528768478b898fd (commit)
commit 14f6f4320815330bd8ed1095d80e8dd1fc12a61f
Author: Sean Davis
Date: Wed Dec 11 10:43:00 2013 +
Fix display mirroring
Signed-off-by: Sean Davis
dialogs/display-settings/main.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b48c9e9..0789517 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1632,8 +1632,8 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
GtkBuilder *builder)
{
GObject *buttons;
-
-guint n;
+guintn;
+RRMode mode;
if (!gtk_toggle_button_get_active(button))
return;
@@ -1646,23 +1646,23 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
buttons = gtk_builder_get_object (builder, "buttons");
gtk_widget_set_sensitive (GTK_WIDGET(buttons), FALSE);
-
-/* Activate all inactive displays */
+
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Configure each available display for mirroring */
for (n = 0; n < xfce_randr->noutput; ++n)
{
if (xfce_randr->mode[n] == None)
-{
-xfce_randr->mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
-}
-}
-
-/* Save changes to primary display */
-xfce_randr_save_output (xfce_randr, "Default", display_channel, 0, FALSE);
+continue;
-/* Save changes to secondary display */
-xfce_randr->relation[1] = XFCE_RANDR_PLACEMENT_MIRROR;
-xfce_randr->related_to[1] = 0;
-xfce_randr_save_output (xfce_randr, "Default", display_channel, 1, TRUE);
+if (mode != None)
+xfce_randr->mode[n] = mode;
+xfce_randr->relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
+xfce_randr->related_to[n] = 0;
+xfce_randr->rotation[n] = RR_Rotate_0;
+xfce_randr_save_output (xfce_randr, "Default", display_channel,
+n, TRUE);
+}
/* Apply all changes */
xfce_randr_apply (xfce_randr, "Default", display_channel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating branch bluesabre/display-settings2
Updating branch refs/heads/bluesabre/display-settings2 as new branch to 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/bluesabre/display-settings2 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Identify Displays button
Updating branch refs/heads/bluesabre/display-settings2
to 18af539c96d36b5464901b12f528768478b898fd (commit)
from 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit)
commit 18af539c96d36b5464901b12f528768478b898fd
Author: Sean Davis
Date: Wed Dec 11 02:36:52 2013 +
Identify Displays button
Signed-off-by: Sean Davis
dialogs/display-settings/display-dialog.glade | 40 +++---
dialogs/display-settings/main.c | 71 ++---
2 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index b4bbd80..db7fcef 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -273,14 +273,40 @@
True
False
-
-Configure _new
displays when connected
+
True
-True
-False
-False
-True
-True
+False
+
+
+Configure
_new displays when connected
+True
+True
+False
+False
+True
+True
+
+
+False
+True
+0
+
+
+
+
+Identify
Displays
+True
+True
+True
+False
+
+
+False
+True
+end
+1
+
+
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8c706db..b48c9e9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -154,6 +154,7 @@ static gint randr_event_base;
/* Used to identify the display */
static GHashTable *display_popups;
+gboolean show_popups = FALSE;
gboolean supports_alpha = FALSE;
@@ -1440,6 +1441,42 @@ display_settings_dialog_response (GtkDialog *dialog,
gtk_main_quit ();
}
+static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (&iter, display_popups);
+while (g_hash_table_iter_next (&iter, &key, &value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE && show_popups);
+return TRUE;
+}
+
+static void
+on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder)
+{
+show_popups = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+set_display_popups_visible (show_popups);
+}
+
static GtkWidget *
@@ -1449,7 +1486,7 @@ display_settings_dialog_new (GtkBuilder *builder)
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
GObject *combobox;
-GObject *label, *check, *mirror;
+GObject *label, *check, *mirror, *identify;
/* Get the treeview */
treeview = gtk_builder_get_object (builder, "randr-outputs");
@@ -1467,6 +1504,9 @@ display_settings_dialog_new (GtkBuilder *builder)
/* Identification popups */
display_setting_identity_popups_populate ();
+identify = gtk_builder_get_object (builder, "identify-displays");
+g_signal_connect (G_OBJECT (identify), "toggled", G_CALLBACK
(on_identify_displays_toggled), builder);
+set_display_popups_visible (show_popups);
/* Treeview selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
@@ -1707,35 +1747,6 @@ screen_on_event (GdkXEvent *xevent,
}
static void
-set_display_popups_visible(gboolean visible)
-{
-GHashTableIter iter;
-gpointer key, value;
-GtkWidget *popup;
-
-g_hash_table_iter_init (&iter, display_popups);
-while (g_hash_table_iter_next (&iter, &key, &value))
-{
-popup = (GtkWidget *) value;
-gtk_widget_set_visible(popup, visible);
-}
-}
-
-static gboolean
-focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-set_
[Xfce4-commits] Make mirror button insensitive if not possible
Updating branch refs/heads/bluesabre/display-settings2
to 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e (commit)
from 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
commit 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e
Author: Sean Davis
Date: Wed Dec 11 10:56:51 2013 +
Make mirror button insensitive if not possible
Signed-off-by: Sean Davis
dialogs/display-settings/main.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0789517..a6f90a2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1869,6 +1869,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
GObject*only_display1, *only_display2, *mirror_displays;
GObject*extend_right, *advanced, *fake_button, *label;
GError *error = NULL;
+RRMode mode;
builder = gtk_builder_new ();
@@ -1911,6 +1912,12 @@ display_settings_show_minimal_dialog (GdkDisplay
*display)
gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr->friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr->mode[1] != None);
+
+/* Can outputs be cloned? */
+if (display_settings_get_n_active_outputs () > 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode !=
None);
if (xfce_randr->mode[0] != None && xfce_randr->mode[1] != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix display mirroring
Updating branch refs/heads/bluesabre/display-settings2
to 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
from 18af539c96d36b5464901b12f528768478b898fd (commit)
commit 14f6f4320815330bd8ed1095d80e8dd1fc12a61f
Author: Sean Davis
Date: Wed Dec 11 10:43:00 2013 +
Fix display mirroring
Signed-off-by: Sean Davis
dialogs/display-settings/main.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b48c9e9..0789517 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1632,8 +1632,8 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
GtkBuilder *builder)
{
GObject *buttons;
-
-guint n;
+guintn;
+RRMode mode;
if (!gtk_toggle_button_get_active(button))
return;
@@ -1646,23 +1646,23 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
buttons = gtk_builder_get_object (builder, "buttons");
gtk_widget_set_sensitive (GTK_WIDGET(buttons), FALSE);
-
-/* Activate all inactive displays */
+
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Configure each available display for mirroring */
for (n = 0; n < xfce_randr->noutput; ++n)
{
if (xfce_randr->mode[n] == None)
-{
-xfce_randr->mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
-}
-}
-
-/* Save changes to primary display */
-xfce_randr_save_output (xfce_randr, "Default", display_channel, 0, FALSE);
+continue;
-/* Save changes to secondary display */
-xfce_randr->relation[1] = XFCE_RANDR_PLACEMENT_MIRROR;
-xfce_randr->related_to[1] = 0;
-xfce_randr_save_output (xfce_randr, "Default", display_channel, 1, TRUE);
+if (mode != None)
+xfce_randr->mode[n] = mode;
+xfce_randr->relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
+xfce_randr->related_to[n] = 0;
+xfce_randr->rotation[n] = RR_Rotate_0;
+xfce_randr_save_output (xfce_randr, "Default", display_channel,
+n, TRUE);
+}
/* Apply all changes */
xfce_randr_apply (xfce_randr, "Default", display_channel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add hotplug checkbox to plug dialog
Updating branch refs/heads/bluesabre/display-settings2 to 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit) from 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit) commit 3c2a9784feea5f9cd549e5b5b1167aad453eb839 Author: Sean Davis Date: Wed Dec 11 02:13:34 2013 + Add hotplug checkbox to plug dialog Signed-off-by: Sean Davis dialogs/display-settings/display-dialog.glade | 454 + 1 file changed, 232 insertions(+), 222 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index db0dcf5..b4bbd80 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -18,241 +18,275 @@ False 2 - + True False 12 -12 +6 - -200 -True -True -automatic -automatic -etched-in - - -True -True -False -False -False - - - - -True -True -0 - - - - + True False -7 -2 -12 -6 - - -False - - -1 -2 -6 -7 -GTK_FILL - - - - -True -False - - -1 -2 -5 -6 -GTK_FILL - - - - -True -False - - -1 -2 -4 -5 -GTK_FILL - - - - -True -False - - -1 -2 -3 -4 -GTK_FILL - - - - -False -0 -Ref_lection: -True - - -6 -7 -GTK_FILL -GTK_FILL - - - - -True -False -0 -Ro_tation: -True - - -5 -6 -GTK_FILL -GTK_FILL - - - - -True -False -0 -Refresh _rate: -True - - -4 -5 -GTK_FILL -GTK_FILL - - - - -True -False -0 -R_esolution: -True - - -3 -4 -GTK_FILL -GTK_FILL - - - - -True -False -0 -P_osition: -True - - -2 -3 -GTK_FILL -GTK_FILL - - +12 - -_Use this output + +200 True True -False -False -True -True - - -2 -GTK_FILL -GTK_FILL
[Xfce4-commits] Show/hide display popups with focus
Updating branch refs/heads/bluesabre/display-settings2
to 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit)
from 8f95e0836365e62d052cc000f3b7a0145cd2c81c (commit)
commit 3e3106903d3d2cc877390c3ff438bfe957fb1e77
Author: Sean Davis
Date: Tue Dec 10 10:32:22 2013 +
Show/hide display popups with focus
Signed-off-by: Sean Davis
dialogs/display-settings/main.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6dcfc5b..8c706db 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1707,6 +1707,35 @@ screen_on_event (GdkXEvent *xevent,
}
static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (&iter, display_popups);
+while (g_hash_table_iter_next (&iter, &key, &value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE);
+return TRUE;
+}
+
+static void
display_settings_show_main_dialog (GdkDisplay *display)
{
GtkBuilder *builder;
@@ -1729,6 +1758,10 @@ display_settings_show_main_dialog (GdkDisplay *display)
randr_event_base,
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+/* Show/Hide the helper popups when the dialog is shown/hidden */
+g_signal_connect(G_OBJECT(dialog), "focus-out-event", G_CALLBACK
(focus_out_event), builder);
+g_signal_connect(G_OBJECT(dialog), "focus-in-event", G_CALLBACK
(focus_in_event), builder);
if (G_UNLIKELY (opt_socket_id == 0))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updated NEWS
Updating branch refs/heads/master to daef92ee8c09a0009ffb8d96e657b3984ffc3a3a (commit) from 95a790fd29464c436bea321847419f562741a9fe (commit) commit daef92ee8c09a0009ffb8d96e657b3984ffc3a3a Author: Sean Davis Date: Sat Jan 25 13:07:14 2014 -0500 Updated NEWS NEWS | 46 ++ 1 file changed, 46 insertions(+) diff --git a/NEWS b/NEWS index 56acce4..de8cf19 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,49 @@ +0.6.0 +=== +- Completed port to GTK+3 + - Remove deprecated GTK+2 items + - Use GtkOverlay for player controls + - Use symbolic icons for menus, plugins +- Improved window maximization + - Window dimensions are no longer saved when maximizing + - Added "window-maximized" setting to xfconf to keep maximization across sessions +- Rearranged and improved menubar + - Renamed "Edit" menu to "Playback" + - Renamed "Languages" menu item to "Audio Track" + - Added Tools menu + - Moved Plugins and Preferences to Tools menu + - Added DVD menu (visible only when a DVD or DVD ISO is being played) + - Added "Save Playlist" item to Media menu + - Added "Contents" item to Help menu + - Added "Report Bug" item to Help menu +- Improved playlist + - Use symbolic icons in an inline toolbar + - Removed redundant settings button + - Added Move Up/Down buttons + - Improved search +- Plugin updates + - Added Previous/Next Track menu items to Tray plugin + - Added Previous/Next Track menu items to Notification plugin + - Added NEW MPRIS2 plugin +- Other improvements + - Updated artwork (background image, icons) + - Fixed GStreamer 1.0 support + - Added ability to play DVD ISOs from the Open dialog + - Plugins now correctly report when they fail to load + - Plugin API documentation updates +- Bugs fixed + - Fixed missing option to open DVD from iso (bug #10300) + - Fixed allowing a playlist to be sorted and/or items to be moved (bug #10066) + - Fixed Remember playlist option in GUI not working (bug #10269) + - Fixed Parole showing irritating edge (bug #10081) + - Fixed untranslatable strings (bug #10418) + - Fixed loading of playlists with relative paths (bug #10436) + - Added realmedia video to supported video mimetypes (bug #10434) + - Fixed IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) + - Fixed building with enable-debug=full on some platforms (bug #10525) + - Fixed crash for m3u files with all absolute paths + - Fixed "Remove Duplicates" functionality. + 0.5.0 === - Fixed potential file name clash in parole extension (bug #9728) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.6.0
Updating annotated tag refs/tags/0.6.0 as new annotated tag to 75de578ad99495a6e7d63e5d13a1b5fd96801f16 (tag) succeeds 0.5.91-15-g1d321b2 tagged by Sean Davis on 2014-01-25 18:54 +0100 Sean Davis (1): Update changelog, version numbers ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update changelog, version numbers
Updating branch refs/heads/master to 95a790fd29464c436bea321847419f562741a9fe (commit) from 1d321b222ed3f13a6fff00d679c5967f124bdb7d (commit) commit 95a790fd29464c436bea321847419f562741a9fe Author: Sean Davis Date: Sat Jan 25 12:53:50 2014 -0500 Update changelog, version numbers ChangeLog |7 +++ configure.ac.in |6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c99c1e7..e42e03f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-01-25: bluesa...@xfce.org +* Stable release 0.6.0 +* Fix bug with DIR handles not being closed (bug #10600) +* Fix crash for m3u files with all absolute paths +* Added 128px appicon +* Added Contents menu-item to Help menu + 2013-12-29: bluesa...@xfce.org * Development release 0.5.91 * Fix untranslatable strings (bug #10418) diff --git a/configure.ac.in b/configure.ac.in index 8990738..6cdffe7 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:5:91]) +m4_define([parole_verinfo], [0:6:0]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) -m4_define([parole_version_minor], [5]) -m4_define([parole_version_micro], [91]) +m4_define([parole_version_minor], [6]) +m4_define([parole_version_micro], [0]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.5.91
Updating annotated tag refs/tags/0.5.91 as new annotated tag to 66fb10744c4ca7a2eaff84dda869e2872c6ebe5b (tag) succeeds 0.5.90-156-gf617bb6 tagged by Sean Davis on 2013-12-30 05:27 +0100 Sean Davis (1): Bump version numbers, change bug icon to face-sad-symbolic by request ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bump version numbers, change bug icon to face-sad-symbolic by request
Updating branch refs/heads/master to e77655f0928d1939f327c88d677a1f3d2b3f606e (commit) from f617bb65411e63a64ca1f5f4a4030d687bcbf1ab (commit) commit e77655f0928d1939f327c88d677a1f3d2b3f606e Author: Sean Davis Date: Sun Dec 29 21:46:25 2013 -0500 Bump version numbers, change bug icon to face-sad-symbolic by request ChangeLog |4 +++- configure.ac.in |4 ++-- data/interfaces/parole.ui |2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e5734d..c99c1e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ -2013-10-30: bluesa...@xfce.org +2013-12-29: bluesa...@xfce.org +* Development release 0.5.91 * Fix untranslatable strings (bug #10418) * Fix loading of playlists with relative paths (bug #10436) * Add realmedia video to supported video mimetypes (bug #10434) @@ -7,6 +8,7 @@ * Fix "Remove Duplicates" functionality. * Plugin API documentation updates * Fixed playlist search +* New MPRIS2 plugin 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 diff --git a/configure.ac.in b/configure.ac.in index fb759e2..22b7c9d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:5:90]) +m4_define([parole_verinfo], [0:5:91]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) m4_define([parole_version_minor], [5]) -m4_define([parole_version_micro], [90]) +m4_define([parole_version_micro], [91]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index e2fd011..a9c0856 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -24,7 +24,7 @@ True False 16 -face-sick-symbolic +face-sad-symbolic True ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Plugin API updates, fix playlist search
Updating branch refs/heads/master to 09df777859122dda720f61512d27739b70fb4d09 (commit) from 17127defa0f564a3bf506292858ef9bed435f187 (commit) commit 09df777859122dda720f61512d27739b70fb4d09 Author: Sean Davis Date: Wed Dec 18 21:15:29 2013 -0500 Plugin API updates, fix playlist search ChangeLog|2 + docs/plugin-api/Makefile.am |5 + docs/plugin-api/Parole-Plugins-docs.sgml | 30 +++ docs/plugin-api/Parole-Plugins-sections.txt | 22 ++- docs/plugin-api/tmpl/Parole-Plugins-unused.sgml | 223 +- docs/plugin-api/tmpl/parole-file.sgml| 59 +- docs/plugin-api/tmpl/parole-provider-player.sgml | 74 +++ docs/plugin-api/tmpl/parole-provider-plugin.sgml | 10 - docs/plugin-api/tmpl/parole-stream.sgml |7 - docs/plugin-api/tmpl/parole.sgml | 18 ++ src/misc/parole-file.c |6 +- src/misc/parole-pl-parser.c |4 +- src/misc/parole-provider-player.c| 12 +- src/misc/parole-stream.c | 10 + src/parole-medialist.c |4 + 15 files changed, 240 insertions(+), 246 deletions(-) diff --git a/ChangeLog b/ChangeLog index 182954c..8e5734d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) * Fix building with enable-debug=full on some platforms (bug #10525) * Fix "Remove Duplicates" functionality. +* Plugin API documentation updates +* Fixed playlist search 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 diff --git a/docs/plugin-api/Makefile.am b/docs/plugin-api/Makefile.am index e7b022b..731b054 100644 --- a/docs/plugin-api/Makefile.am +++ b/docs/plugin-api/Makefile.am @@ -79,6 +79,11 @@ GTKDOC_LIBS=\ if ENABLE_GTK_DOC include $(top_srcdir)/gtk-doc.make +doccheck: $(GTKDOC_CHECK) + $(AM_V_GEN)ln -s $< $@ + +MOSTLYCLEANFILES = doccheck +TESTS = doccheck else EXTRA_DIST= endif diff --git a/docs/plugin-api/Parole-Plugins-docs.sgml b/docs/plugin-api/Parole-Plugins-docs.sgml index 3462610..27a4fc9 100644 --- a/docs/plugin-api/Parole-Plugins-docs.sgml +++ b/docs/plugin-api/Parole-Plugins-docs.sgml @@ -76,5 +76,35 @@ API Index + + +API Index - 0.2 + + + + +API Index - 0.4 + + + + +API Index - 0.6 + + + + +API Index - Deprecated Symbols + + + + +Parole Enum Types + + + + +Parole Marshal + + diff --git a/docs/plugin-api/Parole-Plugins-sections.txt b/docs/plugin-api/Parole-Plugins-sections.txt index 7ff537a..9f4ee8e 100644 --- a/docs/plugin-api/Parole-Plugins-sections.txt +++ b/docs/plugin-api/Parole-Plugins-sections.txt @@ -6,12 +6,20 @@ ParolePluginContainer ParoleState parole_provider_player_get_main_window parole_provider_player_pack +parole_provider_player_get_action +parole_provider_player_set_fullscreen +parole_provider_player_get_fullscreen +parole_stream_set_image +parole_stream_get_image parole_provider_player_get_state parole_provider_player_get_stream +parole_provider_player_get_stream_position parole_provider_player_play_uri parole_provider_player_pause parole_provider_player_resume parole_provider_player_stop +parole_provider_player_play_next +parole_provider_player_play_previous parole_provider_player_seek parole_provider_player_open_media_chooser @@ -24,12 +32,12 @@ parole_provider_player_get_type parole-provider-plugin -ParoleProviderPluginIface ParoleProviderPlugin parole_provider_plugin_get_is_configurable parole_provider_plugin_configure parole_provider_plugin_set_player +ParoleProviderPluginIface PAROLE_PROVIDER_PLUGIN PAROLE_IS_PROVIDER_PLUGIN PAROLE_TYPE_PROVIDER_PLUGIN @@ -41,15 +49,21 @@ parole_provider_plugin_get_type parole-file ParoleFile ParoleFile -ParoleFileClass parole_file_new parole_file_new_with_display_name +parole_file_new_cdda_track +parole_file_new_dvd_chapter parole_file_get_file_name parole_file_get_display_name parole_file_get_uri parole_file_get_directory parole_file_get_content_type +parole_file_set_dvd_chapter +parole_file_get_dvd_chapter +parole_file_set_custom_subtitles +parole_file_get_custom_subtitles +ParoleFileClass PAROLE_FILE PAROLE_IS_FILE PAROLE_TYPE_FILE @@ -61,8 +75,8 @@ parole_file_get_type ParoleMediaType ParoleStream ParoleStream -ParoleStreamClass +ParoleStreamClass PAROLE_STREAM PAROLE_IS_STREAM PAROLE_TYPE_STREAM @@ -110,6 +124,8 @@ PAROLE_DEFINE_TYPE_WITH_CODE PAROLE_DEFINE_ABSTRACT_TYPE PAROLE_DEFINE_ABSTRACT_TYPE_WITH_CODE PAROLE_IMPLEMENT_INTERFACE +parole_get_supported_recent_files_filter +parole_get_supported_recent_media_filter diff --git a/docs/plugin-api/tmpl/Parole-Plugins-unused.sgml b/docs/plugin-api/tmpl/P
[Xfce4-commits] Fix build issues
Updating branch refs/heads/master to 0e38dedb0f4523389b6208cdd7b0ecc8ed724748 (commit) from b2d6681ea42a4d4c12f9e0b047695282badd0ae9 (commit) commit 0e38dedb0f4523389b6208cdd7b0ecc8ed724748 Author: Sean Davis Date: Tue Dec 17 19:41:54 2013 -0500 Fix build issues po/POTFILES.in |2 ++ src/plugins/mpris2/Makefile.am |2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index aa47f17..dde9b7f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,3 +28,5 @@ src/plugins/tray/tray-plugin.c src/plugins/tray/tray-provider.c src/plugins/tray/tray-provider.h src/plugins/tray/system-tray.desktop.in +src/plugins/mpris2/mpris2-provider.c +src/plugins/mpris2/mpris2.desktop.in diff --git a/src/plugins/mpris2/Makefile.am b/src/plugins/mpris2/Makefile.am index ba9f37d..1e5e8d5 100644 --- a/src/plugins/mpris2/Makefile.am +++ b/src/plugins/mpris2/Makefile.am @@ -20,7 +20,7 @@ parole_mpris2_la_SOURCES =\ parole_mpris2_la_CFLAGS = \ $(PLATFORM_CFLAGS) \ $(GTK_CFLAGS) \ -$(GST_INTERFACES_CFLAGS) \ +$(GST_BASE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) parole_mpris2_la_LDFLAGS = \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update parole-plugin-doc copyrights
Updating branch refs/heads/master to bea3896aa96ad8abc509dc15db2c3033e3cf5553 (commit) from 87a5f7448a7219008f01e8a8b239607eeeca7957 (commit) commit bea3896aa96ad8abc509dc15db2c3033e3cf5553 Author: Sean Davis Date: Fri Dec 13 07:10:13 2013 -0500 Update parole-plugin-doc copyrights docs/plugin-api/Parole-Plugins-docs.sgml |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/plugin-api/Parole-Plugins-docs.sgml b/docs/plugin-api/Parole-Plugins-docs.sgml index 55baf32..3462610 100644 --- a/docs/plugin-api/Parole-Plugins-docs.sgml +++ b/docs/plugin-api/Parole-Plugins-docs.sgml @@ -5,7 +5,7 @@ http://www.w3.org/2003/XInclude'"> - + ]> @@ -16,9 +16,13 @@ &date; - 2009 + 2009-2011 Ali Abdallah + + 2012-2013 + Sean Davis, Simon Steinbeiss + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Documentation and interface fixes
Updating branch refs/heads/master
to 87a5f7448a7219008f01e8a8b239607eeeca7957 (commit)
from f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a (commit)
commit 87a5f7448a7219008f01e8a8b239607eeeca7957
Author: Sean Davis
Date: Fri Dec 13 06:54:49 2013 -0500
Documentation and interface fixes
docs/plugin-api/tmpl/parole-provider-player.sgml |8
docs/plugin-api/tmpl/parole-stream.sgml | 15 +++
src/misc/parole-provider-player.c| 13 +++--
src/misc/parole-provider-player.h|5 -
src/parole-plugin-player.c |6 ++
5 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/docs/plugin-api/tmpl/parole-provider-player.sgml
b/docs/plugin-api/tmpl/parole-provider-player.sgml
index c9706e5..49a31cc 100644
--- a/docs/plugin-api/tmpl/parole-provider-player.sgml
+++ b/docs/plugin-api/tmpl/parole-provider-player.sgml
@@ -28,6 +28,14 @@ playback status.
+
+
+
+
+
+@paroleproviderplayeriface: the object which received the signal.
+@arg1:
+
diff --git a/docs/plugin-api/tmpl/parole-stream.sgml
b/docs/plugin-api/tmpl/parole-stream.sgml
index 55dfd9b..e8a862d 100644
--- a/docs/plugin-api/tmpl/parole-stream.sgml
+++ b/docs/plugin-api/tmpl/parole-stream.sgml
@@ -58,6 +58,11 @@ signal of the player, the plugin shouldn't take reference
and all the properties
+
+
+
+
+
@@ -78,6 +83,11 @@ signal of the player, the plugin shouldn't take reference
and all the properties
+
+
+
+
+
@@ -88,6 +98,11 @@ signal of the player, the plugin shouldn't take reference
and all the properties
+
+
+
+
+
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 4496170..d3c7c03 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -469,7 +469,16 @@ void parole_provider_player_open_media_chooser
(ParoleProviderPlayer *player)
**/
GtkAction *parole_provider_player_get_action(ParoleProviderPlayer *player,
ParolePlayerAction action)
{
-return parole_player_get_action(action);
+GtkAction *ret = NULL;;
+
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action )
+{
+ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action)
(player, action);
+}
+
+return ret;
}
/**
@@ -484,7 +493,7 @@ gboolean
parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
{
g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
-if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen )
{
return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)->get_fullscreen) (player);
}
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 0c93d8e..7551276 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -88,7 +88,10 @@ struct _ParoleProviderPlayerIface
gboolean (*set_fullscreen) (ParoleProviderPlayer *player,
gboolean fullscreen);
-void (*open_media_chooser) (ParoleProviderPlayer *player);
+void (*open_media_chooser) (ParoleProviderPlayer *player);
+
+GtkAction* (*get_action) (ParoleProviderPlayer *player,
+ ParolePlayerAction action);
/*< signals >*/
void (*tag_message) (ParoleProviderPlayer *player,
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 191f190..91c5f82 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -223,6 +223,11 @@ static void parole_plugin_player_open_media_chooser
(ParoleProviderPlayer *provi
g_object_unref (list);
}
+static GtkAction* parole_plugin_player_get_action (ParoleProviderPlayer
*provider, ParolePlayerAction action)
+{
+return parole_player_get_action (action);
+}
+
static gboolean parole_plugin_player_get_fullscreen (ParoleProviderPlayer
*provider)
{
ParolePluginPlayer *player;
@@ -261,6 +266,7 @@ static void parole_plugin_player_iface_init
(ParoleProviderPlayerIface *iface)
iface->seek = parole_plugin_player_seek;
iface->get_stream_position = parole_plugin_player_get_stream_position;
iface->open_media_chooser = parole_plugin_player_open_media_chooser;
+iface->get_action = parole_plugin_player_get_action;
iface->get_fullscreen = parole_plugin_player_get_fullscreen;
iface->set_fullscreen = parole_plugin_player_set_fullscreen;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update licenses
Updating branch refs/heads/master to f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a (commit) from a2eed21e9c2c6404f7ee17d8bd9a722109220c92 (commit) commit f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a Author: Sean Davis Date: Wed Dec 11 19:48:50 2013 -0500 Update licenses src/plugins/mpris2/mpris2-plugin.c |2 ++ src/plugins/mpris2/mpris2-provider.c |2 ++ src/plugins/mpris2/mpris2-provider.h |2 ++ src/plugins/mpris2/mpris2.desktop.in |2 +- src/plugins/notify/notify-plugin.c |2 ++ src/plugins/notify/notify-provider.c |2 ++ src/plugins/notify/notify-provider.h |2 ++ src/plugins/sample/sample-plugin.c |2 ++ src/plugins/sample/sample-provider.c |2 ++ src/plugins/sample/sample-provider.h |2 ++ src/plugins/tray/tray-plugin.c |2 ++ src/plugins/tray/tray-provider.c |2 ++ src/plugins/tray/tray-provider.h |2 ++ 13 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/plugins/mpris2/mpris2-plugin.c b/src/plugins/mpris2/mpris2-plugin.c index 80d70d1..b55f5f2 100644 --- a/src/plugins/mpris2/mpris2-plugin.c +++ b/src/plugins/mpris2/mpris2-plugin.c @@ -1,5 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß http://goodies.xfce.org/projects/applications/parole diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c index ebf7bb2..63c1126 100644 --- a/src/plugins/notify/notify-plugin.c +++ b/src/plugins/notify/notify-plugin.c @@ -1,5 +1,7 @@ /* + * * Copyright (C) 2009-2011 Ali * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß + * * Copyright (C) 2012-2013 Sean Davis + * * Copyright (C) 2012-2013 Simon Steinbeiß https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Handle volume updates from conf
Updating branch refs/heads/master
to c96da1b170d495e9313206cad4821ee22b213d70 (commit)
from 0b59cbffe41e539f763fd05978c54697e875676a (commit)
commit c96da1b170d495e9313206cad4821ee22b213d70
Author: Sean Davis
Date: Sat Dec 7 08:49:12 2013 -0500
Handle volume updates from conf
src/plugins/mpris2/mpris2-provider.c | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 1fc8a7e..34752ed 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -523,13 +523,20 @@ static GVariant* mpris_Player_get_Metadata (GError
**error, Mpris2Provider *prov
return g_variant_builder_end(&b);
}
-static GVariant* mpris_Player_get_Volume (GError **error, Mpris2Provider
*provider)
+static gdouble handle_get_volume (Mpris2Provider *provider)
{
-gdouble volume = 0;
-
-g_object_get (G_OBJECT (provider->conf), "volume", &volume, NULL);
+gint volume_int = 0;
+gdouble volume_double;
+
+g_object_get (G_OBJECT (provider->conf), "volume", &volume_int, NULL);
+volume_double = (double)volume_int / 100.0;
+
+return volume_double;
+}
-return g_variant_new_double(volume / 100.0);
+static GVariant* mpris_Player_get_Volume (GError **error, Mpris2Provider
*provider)
+{
+return g_variant_new_double(handle_get_volume(provider));
}
static void mpris_Player_put_Volume (GVariant *value, GError **error,
Mpris2Provider *provider)
@@ -662,7 +669,7 @@ static void parole_mpris_update_any (Mpris2Provider
*provider)
provider->saved_playbackstatus = repeat;
g_variant_builder_add (&b, "{sv}", "LoopStatus",
mpris_Player_get_LoopStatus (NULL, provider));
}
-//curr_vol = pragha_backend_get_volume (backend);
+curr_vol = handle_get_volume(provider);
if(provider->volume != curr_vol)
{
change_detected = TRUE;
@@ -953,6 +960,9 @@ mpris2_provider_set_player (ParoleProviderPlugin *plugin,
ParoleProviderPlayer *
g_signal_connect ( provider->conf, "notify::repeat",
G_CALLBACK (conf_changed_cb), plugin);
+g_signal_connect ( provider->conf, "notify::volume",
+ G_CALLBACK (conf_changed_cb), plugin);
+
window = parole_provider_player_get_main_window(provider->player);
g_signal_connect( G_OBJECT(window),
"window-state-event",
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use G_BINDING_SYNC_CREATE for binding settings and initial values
Updating branch refs/heads/master
to 91e44144a932fbe91966d630f37a42348e609a96 (commit)
from 60f9808d30af676995c04c8553b1ac5c874ee301 (commit)
commit 91e44144a932fbe91966d630f37a42348e609a96
Author: Sean Davis
Date: Sun Nov 17 22:42:48 2013 -0500
Use G_BINDING_SYNC_CREATE for binding settings and initial values
src/parole-conf-dialog.c | 91 --
src/parole-player.c | 15 +---
2 files changed, 10 insertions(+), 96 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 63cc3d3..45c10a4 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -305,87 +305,17 @@ parole_conf_dialog_set_default_vis_plugin (GtkTreeModel
*model, GtkTreePath *pat
return ret;
}
-/* Load the default playlist settings */
-static void
-parole_conf_dialog_set_defaults_playlist (ParoleConfDialog *self, GtkBuilder
*builder)
-{
-GtkWidget *widget;
-gboolean option;
-
-/**
- * Replace playlist with opened files.
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder, "replace-playlist"));
-
-g_object_get (G_OBJECT (self->priv->conf),
- "replace-playlist", &option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Start playing opened files
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder,
"start-playing-opened"));
-
-g_object_get (G_OBJECT (self->priv->conf),
- "play-opened-files", &option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Remove duplicated playlist entries
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder,
"remove-duplicated"));
-
-g_object_get (G_OBJECT (self->priv->conf),
- "remove-duplicated", &option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Remember playlist
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder,
"remember-playlist"));
-
-g_object_get (G_OBJECT (self->priv->conf),
- "remember-playlist", &option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-}
-
-/* Load the multimedia-button default settings */
-static void
-parole_conf_dialog_set_defaults_general (ParoleConfDialog *self, GtkBuilder
*builder)
-{
-GtkWidget *widget;
-gboolean option;
-
-widget = GTK_WIDGET (gtk_builder_get_object (builder, "multimedia-keys"));
-
-g_object_get (G_OBJECT (self->priv->conf),
- "multimedia-keys", &option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-}
-
/* Load the rest of the settings stored in the rc file */
static void
parole_conf_dialog_set_defaults (ParoleConfDialog *self)
{
GtkTreeModel *model;
gboolean vis_enabled;
-gboolean subtitle;
gchar *subtitle_font;
gchar *subtitle_encoding;
g_object_get (G_OBJECT (self->priv->conf),
"vis-enabled", &vis_enabled,
- "enable-subtitle", &subtitle,
"subtitle-font", &subtitle_font,
"subtitle-encoding", &subtitle_encoding,
NULL);
@@ -393,9 +323,6 @@ parole_conf_dialog_set_defaults (ParoleConfDialog *self)
/* Update widget-states according to settings */
gtk_widget_set_sensitive (self->priv->vis_combox, vis_enabled);
-gtk_switch_set_active (GTK_SWITCH (self->priv->toggle_vis), vis_enabled);
-gtk_switch_set_active (GTK_SWITCH (self->priv->toggle_subtitle), subtitle);
-
model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->vis_combox));
gtk_tree_model_foreach (model,
@@ -446,8 +373,6 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
self->priv->vis_combox = combox;
parole_conf_dialog_set_defaults (self);
-parole_conf_dialog_set_defaults_general (self, builder);
-parole_conf_dialog_set_defaults_playlist (self, builder);
with_display = parole_gst_get_is_xvimage_sink (PAROLE_GST (parole_gst_get
()));
@@ -494,50 +419,50 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder,
"reset-saver"));
g_object_bind_property(G_OBJECT (self->priv->conf), "reset-saver",
switch_widget, "active",
- G_BINDING_BIDIRECTIONAL);
+ G
[Xfce4-commits] Fix xfconf notify when property changes
Updating branch refs/heads/master
to 4dcd29ac684c91d9dfdee42a74c992e6fc5bafd7 (commit)
from 38f53010485fc03c737ffd0b0144a2538bd5a7c8 (commit)
commit 4dcd29ac684c91d9dfdee42a74c992e6fc5bafd7
Author: Sean Davis
Date: Mon Nov 11 21:52:20 2013 -0500
Fix xfconf notify when property changes
src/parole-conf.c | 77 +
1 file changed, 66 insertions(+), 11 deletions(-)
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 092ff45..ccee601 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -91,6 +91,8 @@ static void parole_conf_get_property(GObject
*object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
+gchar
+*parole_conf_map_xfconf_property_name (const gchar *prop_name);
static void parole_conf_set_property(GObject*object,
guint prop_id,
const GValue *value,
@@ -257,6 +259,69 @@ static void parole_conf_get_property (GObject *object,
}
}
+/* Facilitate the conversion from xfconf property name to parole property name
*/
+gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+{
+gchar *value = NULL;
+if (g_strcmp0(prop_name, "/audio/visualization-enabled") == 0)
+value = g_strdup("vis-enabled");
+if (g_strcmp0(prop_name, "/audio/visualization-name") == 0)
+value = g_strdup("vis-name");
+if (g_strcmp0(prop_name, "/audio/volume") == 0)
+value = g_strdup("volume");
+if (g_strcmp0(prop_name, "/folders/last-used-media") == 0)
+value = g_strdup("media-chooser-folder");
+if (g_strcmp0(prop_name, "/parole/multimedia-keys") == 0)
+value = g_strdup("multimedia-keys");
+if (g_strcmp0(prop_name, "/parole/plugins") == 0)
+value = g_strdup("plugins");
+if (g_strcmp0(prop_name, "scan-recursive") == 0)
+value = g_strdup("/parole/scan-recursive");
+if (g_strcmp0(prop_name, "/playlist/remember-playlist") == 0)
+value = g_strdup("remember-playlist");
+if (g_strcmp0(prop_name, "/playlist/remove-duplicates") == 0)
+value = g_strdup("remove-duplicated");
+if (g_strcmp0(prop_name, "/playlist/repeat") == 0)
+value = g_strdup("repeat");
+if (g_strcmp0(prop_name, "/playlist/replace-playlist") == 0)
+value = g_strdup("replace-playlist");
+if (g_strcmp0(prop_name, "/playlist/show-playlist") == 0)
+value = g_strdup("showhide-playlist");
+if (g_strcmp0(prop_name, "/playlist/shuffle") == 0)
+value = g_strdup("shuffle");
+if (g_strcmp0(prop_name, "/playlist/play-opened-files") == 0)
+value = g_strdup("play-opened-files");
+if (g_strcmp0(prop_name, "/subtitles/enabled") == 0)
+value = g_strdup("enable-subtitle");
+if (g_strcmp0(prop_name, "/subtitles/encoding") == 0)
+value = g_strdup("subtitle-encoding");
+if (g_strcmp0(prop_name, "/subtitles/font") == 0)
+value = g_strdup("subtitle-font");
+if (g_strcmp0(prop_name, "/video/aspect-ratio") == 0)
+value = g_strdup("aspect-ratio");
+if (g_strcmp0(prop_name, "/video/brightness") == 0)
+value = g_strdup("brightness");
+if (g_strcmp0(prop_name, "/video/contrast") == 0)
+value = g_strdup("contrast");
+if (g_strcmp0(prop_name, "/video/disable-screensaver") == 0)
+value = g_strdup("reset-saver");
+if (g_strcmp0(prop_name, "/video/enable-xv") == 0)
+value = g_strdup("enable-xv");
+if (g_strcmp0(prop_name, "/video/hue") == 0)
+value = g_strdup("hue");
+if (g_strcmp0(prop_name, "/video/saturation") == 0)
+value = g_strdup("saturation");
+if (g_strcmp0(prop_name, "/window/height") == 0)
+value = g_strdup("window-height");
+if (g_strcmp0(prop_name, "/window/minimized") == 0)
+value = g_strdup("minimized");
+if (g_strcmp0(prop_name, "/window/maximized") == 0)
+value = g_strdup("window-maximized");
+if (g_strcmp0(prop_name, "/window/width") == 0)
+value = g_strdup("window-width");
+return value;
+}
+
/**
* parole_conf_prop_changed:
* @channel : the #XfconfChannel where settings are stored.
@@ -274,17 +339,7 @@ sta
[Xfce4-commits] Fix warning for CanPause being False when the player is currently paused
Updating branch refs/heads/master
to 9276bc68d7dca3d68590bad6ae217346b59776ae (commit)
from e48f090c7c9c047e00a6b95dff84713599658adc (commit)
commit 9276bc68d7dca3d68590bad6ae217346b59776ae
Author: Sean Davis
Date: Sun Nov 17 07:03:59 2013 -0500
Fix warning for CanPause being False when the player is currently paused
src/plugins/mpris2/mpris2-provider.c |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 1dd8195..465ef59 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -570,15 +570,19 @@ static GVariant* mpris_Player_get_CanGoPrevious (GError
**error, Mpris2Provider
static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider
*provider)
{
// TODO: this can cause a UI-lock
+/* The CanPlay property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider->player;
-return g_variant_new_boolean(parole_provider_player_get_state (player) ==
PAROLE_STATE_PAUSED);
+gint state = parole_provider_player_get_state (player);
+return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state ==
PAROLE_STATE_PLAYING);
}
static GVariant* mpris_Player_get_CanPause (GError **error, Mpris2Provider
*provider)
{
// TODO: this can cause a UI-lock
+/* The CanPause property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider->player;
-return g_variant_new_boolean(parole_provider_player_get_state (player) ==
PAROLE_STATE_PLAYING);
+gint state = parole_provider_player_get_state (player);
+return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state ==
PAROLE_STATE_PLAYING);
}
static GVariant* mpris_Player_get_CanSeek (GError **error, Mpris2Provider
*provider)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix genre for real
Updating branch refs/heads/master
to 01c98b546a494d63225b8101ff17b3f01df62277 (commit)
from 026ed6b8ad4fd15293b00c2c47e83bfe4165b5e2 (commit)
commit 01c98b546a494d63225b8101ff17b3f01df62277
Author: Sean Davis
Date: Sun Nov 17 14:52:24 2013 -0500
Fix genre for real
src/plugins/mpris2/mpris2-provider.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 58dbee4..2d6709e 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -469,8 +469,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
handle_strings_request(b, "xesam:artist", artist);
g_variant_builder_add (b, "{sv}", "xesam:album",
g_variant_new_string(album));
-g_variant_builder_add (b, "xesam:genre",
-g_variant_new_string(genre));
+handle_strings_request(b, "xesam:genre", genre);
g_variant_builder_add (b, "{sv}", "xesam:contentCreated",
g_variant_new_string(year));
g_variant_builder_add (b, "{sv}", "xesam:trackNumber",
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix Track ID
Updating branch refs/heads/master
to 28472fbc56401e120bdd9747c2cb1e703920b872 (commit)
from d132bc7880c30ceedcb1aaf5ed1752929680d1ee (commit)
commit 28472fbc56401e120bdd9747c2cb1e703920b872
Author: Sean Davis
Date: Sun Nov 17 14:31:28 2013 -0500
Fix Track ID
src/gst/parole-gst.c | 10 ++
src/plugins/mpris2/mpris2-provider.c | 12 +++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 7fc18cd..3dc1191 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1297,6 +1297,8 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
{
gchar *str;
GDate *date;
+guint integer;
+
GdkPixbuf *pixbuf;
if ( gst_tag_list_get_string_index (tag, GST_TAG_TITLE, 0, &str) )
@@ -1347,6 +1349,14 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
g_free (str);
}
+if ( gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, &integer) )
+{
+TRACE ("track:%i", integer);
+g_object_set (G_OBJECT (gst->priv->stream),
+ "track", integer,
+ NULL);
+}
+
pixbuf = parole_gst_tag_list_get_cover (gst, tag);
if (pixbuf)
{
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index ebc34c5..3a37389 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -442,6 +442,7 @@ static void handle_strings_request(GVariantBuilder *b,
const gchar *tag, const g
static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder
*b)
{
gchar *title, *album, *artist, *year, *comment, *stream_uri, *image_uri;
+gint track_id;
gint64 duration;
g_object_get (G_OBJECT (stream),
@@ -453,6 +454,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
"duration", &duration,
"uri", &stream_uri,
"image_uri", &image_uri,
+ "track", &track_id,
NULL);
g_variant_builder_add (b, "{sv}", "mpris:trackid",
@@ -466,19 +468,19 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
handle_strings_request(b, "xesam:artist", artist);
g_variant_builder_add (b, "{sv}", "xesam:album",
g_variant_new_string(album));
-handle_strings_request(b, "xesam:genre", "unknown"); // FIXME: genre was
mandatory?
+handle_strings_request(b, "xesam:genre", "unknown");//
GST_TAG_GENRE
g_variant_builder_add (b, "{sv}", "xesam:contentCreated",
g_variant_new_string(year));
g_variant_builder_add (b, "{sv}", "xesam:trackNumber",
-g_variant_new_int32(0));
+g_variant_new_int32(track_id));
handle_strings_request(b, "xesam:comment", comment);
g_variant_builder_add (b, "{sv}", "mpris:length",
g_variant_new_int64((gint64)duration * 100));
-g_variant_builder_add (b, "{sv}", "audio-bitrate", // TODO: How get audio
properties?
+g_variant_builder_add (b, "{sv}", "audio-bitrate", //
GST_TAG_BITRATE
g_variant_new_int32(0));
-g_variant_builder_add (b, "{sv}", "audio-channels",
+g_variant_builder_add (b, "{sv}", "audio-channels", // No GST_TAG
g_variant_new_int32(0));
-g_variant_builder_add (b, "{sv}", "audio-samplerate",
+g_variant_builder_add (b, "{sv}", "audio-samplerate", // No GST_TAG
g_variant_new_int32(0));
g_free(title);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add bitrate
Updating branch refs/heads/master
to 5a131b68acad5f22e0e56f1c8814a8747c6d54ac (commit)
from 01c98b546a494d63225b8101ff17b3f01df62277 (commit)
commit 5a131b68acad5f22e0e56f1c8814a8747c6d54ac
Author: Sean Davis
Date: Sun Nov 17 15:19:44 2013 -0500
Add bitrate
src/gst/parole-gst.c |8
src/misc/parole-stream.c | 25 +
src/plugins/mpris2/mpris2-provider.c |8 +---
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index e6528b0..b18f425 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1367,6 +1367,14 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
NULL);
}
+if ( gst_tag_list_get_uint (tag, GST_TAG_BITRATE, &integer) )
+{
+TRACE ("bitrate:%i", integer);
+g_object_set (G_OBJECT (gst->priv->stream),
+ "bitrate", integer,
+ NULL);
+}
+
pixbuf = parole_gst_tag_list_get_cover (gst, tag);
if (pixbuf)
{
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 2744f06..82d8e32 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -72,6 +72,7 @@ struct _ParoleStreamPrivate
gchar *album;
gchar *comment;
gchar *genre;
+guint bitrate;
GdkPixbuf *image;
gchar *image_uri, *previous_image;
@@ -103,6 +104,7 @@ enum
PROP_ALBUM,
PROP_COMMENT,
PROP_GENRE,
+PROP_BITRATE,
PROP_IMAGE_URI
};
@@ -230,6 +232,9 @@ static void parole_stream_set_property (GObject *object,
case PROP_GENRE:
PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)->genre, value);
break;
+case PROP_BITRATE:
+PAROLE_STREAM_GET_PRIVATE (stream)->bitrate = g_value_get_uint
(value);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -315,6 +320,9 @@ static void parole_stream_get_property (GObject *object,
case PROP_GENRE:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)->genre);
break;
+case PROP_BITRATE:
+g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE
(stream)->bitrate);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -749,6 +757,22 @@ parole_stream_class_init (ParoleStreamClass *klass)
"URI for the album artwork",
NULL,
G_PARAM_READWRITE));
+
+/**
+ * ParoleStream:bitrate:
+ *
+ * Current bitrate in bits/s.
+ *
+ * Since: 0.6
+ **/
+g_object_class_install_property (object_class,
+ PROP_BITRATE,
+ g_param_spec_uint ("bitrate",
+ "Bitrate",
+ "Bitrate",
+ 0, 2147483647,
+ 0,
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParoleStreamPrivate));
}
@@ -787,6 +811,7 @@ void parole_stream_init_properties (ParoleStream *stream)
priv->track = 1;
priv->disp_par_n = 1;
priv->disp_par_d = 1;
+priv->bitrate = 0;
PAROLE_STREAM_FREE_STR_PROP (priv->title);
PAROLE_STREAM_FREE_STR_PROP (priv->uri);
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 2d6709e..01c0bea 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -442,7 +442,7 @@ static void handle_strings_request(GVariantBuilder *b,
const gchar *tag, const g
static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder
*b)
{
gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre,
*image_uri;
-gint track_id;
+gint track_id, bitrate;
gint64 duration;
g_object_get (G_OBJECT (stream),
@@ -456,6 +456,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
"genre", &genre,
"image_uri", &image_uri,
"track", &track_id,
+ "bitrate", &bitrate,
NULL);
g_variant_builder_add (b, "{sv}", "mpris:trackid",
@@ -477,8 +478,8 @@ static void hand
[Xfce4-commits] Fix debug builds, enable no-cover albumart
Updating branch refs/heads/master
to 5bddac966a1fcd33dc3e4e26465e921142096a02 (commit)
from ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686 (commit)
commit 5bddac966a1fcd33dc3e4e26465e921142096a02
Author: Sean Davis
Date: Sun Dec 8 07:02:37 2013 -0500
Fix debug builds, enable no-cover albumart
data/pixmaps/Makefile.am |3 ++-
data/pixmaps/no-cover.png| Bin 0 -> 11327 bytes
src/misc/parole-stream.c |2 +-
src/plugins/mpris2/mpris2-provider.c | 28 ++--
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 44c3121..ec31ae3 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -1,5 +1,6 @@
pixmaps = \
- parole.png
+ parole.png \
+ no-cover.png
pixmaps_DATA = \
$(pixmaps)
diff --git a/data/pixmaps/no-cover.png b/data/pixmaps/no-cover.png
new file mode 100644
index 000..2ff85ba
Binary files /dev/null and b/data/pixmaps/no-cover.png differ
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 82d8e32..3db0b61 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -370,7 +370,7 @@ parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
{
PAROLE_STREAM_GET_PRIVATE (stream)->image = NULL;
PAROLE_STREAM_GET_PRIVATE (stream)->previous_image = NULL;
-PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = NULL;
+PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = g_strdup_printf
("file://%s/no-cover.png", PIXMAPS_DIR);
}
}
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 5b5f12a..c543aaa 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -64,7 +64,6 @@ PAROLE_DEFINE_TYPE_WITH_CODE (Mpris2Provider,
PAROLE_IMPLEMENT_INTERFACE
(PAROLE_TYPE_PROVIDER_PLUGIN,
mpris2_provider_iface_init));
-
static const gchar mpris2xml[] =
""
""
@@ -332,22 +331,23 @@ static void mpris_Player_Stop (GDBusMethodInvocation
*invocation, GVariant* para
static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant*
parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+gint64 param;
+gint64 curr_pos;
+gint64 seek;
+gint64 duration;
if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
return;
}
-
-const ParoleStream *stream = parole_provider_player_get_stream(player);
-gint64 param;
g_variant_get(parameters, "(x)", ¶m);
-gint64 curr_pos = parole_provider_player_get_stream_position (player);
-gint64 seek = (curr_pos + param) / GST_MSECOND;
+curr_pos = parole_provider_player_get_stream_position (player);
+seek = (curr_pos + param) / GST_MSECOND;
-gint64 duration;
g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
seek = CLAMP (seek, 0, duration);
@@ -360,24 +360,24 @@ static void mpris_Player_Seek (GDBusMethodInvocation
*invocation, GVariant* para
static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation,
GVariant* parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider->player;
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+gchar *track_id = NULL;
+gint64 param;
+gint64 seek;
+gint64 duration;
if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
return;
}
-
-const ParoleStream *stream = parole_provider_player_get_stream(player);
-gchar *track_id = NULL;
/* Do we need to do anything with track_id? */
-gint64 param;
g_variant_get(parameters, "(ox)", &track_id, ¶m);
g_free(track_id);
-gint64 seek = param / GST_MSECOND;
-
-gint64 duration;
+seek = param / GST_MSECOND;
+
g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
seek = CLAMP (seek, 0, duration);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add parole_provider_player_get_stream_position
Updating branch refs/heads/master
to 60f9808d30af676995c04c8553b1ac5c874ee301 (commit)
from 5a131b68acad5f22e0e56f1c8814a8747c6d54ac (commit)
commit 60f9808d30af676995c04c8553b1ac5c874ee301
Author: Sean Davis
Date: Sun Nov 17 16:45:12 2013 -0500
Add parole_provider_player_get_stream_position
src/misc/parole-provider-player.c| 20
src/misc/parole-provider-player.h|4
src/parole-plugin-player.c | 16 +++-
src/plugins/mpris2/mpris2-provider.c |9 ++---
4 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 659ee71..e82303e 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -402,6 +402,26 @@ gboolean parole_provider_player_seek (ParoleProviderPlayer
*player, gdouble pos)
return ret;
}
+/**
+ * parole_provider_player_get_fullscreen:
+ * @player: a #ParoleProviderPlayer
+ *
+ * Get fullscreen status for Parole.
+ *
+ * Since: 0.6
+ **/
+gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer
*player)
+{
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), 0);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream_position )
+{
+return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)->get_stream_position) (player);
+}
+
+return FALSE;
+}
+
/**
* parole_provider_player_open_media_chooser:
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 2ee85f6..73ddc5f 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -81,6 +81,8 @@ struct _ParoleProviderPlayerIface
gboolean (*seek)(ParoleProviderPlayer *player,
gdouble pos);
+gdouble (*get_stream_position) (ParoleProviderPlayer *player);
+
gboolean (*get_fullscreen) (ParoleProviderPlayer *player);
gboolean (*set_fullscreen) (ParoleProviderPlayer *player,
@@ -128,6 +130,8 @@ gbooleanparole_provider_player_play_next
(ParoleProviderPlayer *player);
gbooleanparole_provider_player_seek (ParoleProviderPlayer *player,
gdouble pos);
+
+gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer
*player);
void
parole_provider_player_open_media_chooser (ParoleProviderPlayer *player);
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 8bd0922..121dc23 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -197,6 +197,19 @@ parole_plugin_player_seek (ParoleProviderPlayer *provider,
gdouble pos)
return TRUE;
}
+static gdouble
+parole_plugin_player_get_stream_position (ParoleProviderPlayer *provider)
+{
+ParolePluginPlayer *player;
+gdouble position = 0;
+
+player = PAROLE_PLUGIN_PLAYER (provider);
+
+position = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst));
+
+return position;
+}
+
static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer
*provider)
{
ParoleMediaList *list;
@@ -243,6 +256,7 @@ static void parole_plugin_player_iface_init
(ParoleProviderPlayerIface *iface)
iface->play_previous = parole_plugin_player_play_previous;
iface->play_next = parole_plugin_player_play_next;
iface->seek = parole_plugin_player_seek;
+iface->get_stream_position = parole_plugin_player_get_stream_position;
iface->open_media_chooser = parole_plugin_player_open_media_chooser;
iface->get_fullscreen = parole_plugin_player_get_fullscreen;
iface->set_fullscreen = parole_plugin_player_set_fullscreen;
@@ -302,7 +316,7 @@ parole_plugin_player_init (ParolePluginPlayer *player)
g_signal_connect( G_OBJECT(window),
"window-state-event",
G_CALLBACK(parole_plugin_player_window_state_event),
-PAROLE_PLAYER(player) );
+player );
player->priv->packed = FALSE;
player->priv->box = NULL;
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 01c0bea..d57b2cc 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -538,15 +538,10 @@ static void mpris_Player_put_Volume (GVariant *value,
GError **error, Mpris2Prov
static GVariant* mpris_Player_get_Position (GError **error, Mpris2Provider
*provider)
{
+ParoleProviderPlayer *player = provider->player;
gdouble position = 0;
-/* TODO: How get position?
-gdouble position =
[Xfce4-commits] Fix Identifier, mimetypes, and CanPlay/CanPause status
Updating branch refs/heads/master
to 0e5fd5f87afcd5622ad8af083708a543fbfe7a45 (commit)
from 6d9c6fa9b028e6292650eba664426baebbb81666 (commit)
commit 0e5fd5f87afcd5622ad8af083708a543fbfe7a45
Author: Sean Davis
Date: Sat Nov 16 21:55:58 2013 -0500
Fix Identifier, mimetypes, and CanPlay/CanPause status
src/plugins/mpris2/mpris2-provider.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 37986c1..04dcc5c 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -167,7 +167,7 @@ static GVariant* mpris_Root_get_HasTrackList (GError
**error, Mpris2Provider *pr
static GVariant* mpris_Root_get_Identity (GError **error, Mpris2Provider
*provider)
{
// This is OK
-return g_variant_new_string("Parole");
+return g_variant_new_string(_("Parole Media Player"));
}
static GVariant* mpris_Root_get_DesktopEntry (GError **error, Mpris2Provider
*provider)
@@ -205,7 +205,7 @@ static GVariant* mpris_Root_get_SupportedMimeTypes (GError
**error, Mpris2Provid
"'audio/x-realaudio', 'audio/x-s3m', 'audio/x-sbc', 'audio/x-speex', "
"'audio/x-stm', 'audio/x-tta', 'audio/x-vorbis', 'audio/x-vorbis+ogg',
"
"'audio/x-wav', 'audio/x-wavpack', 'audio/x-xm', "
-"'image/vnd.rn-realpix', 'image/x-pict', 'misc/ultravox', "
+"'image/vnd.rn-realpix', 'image/x-pict', "
"'text/x-google-video-pointer', 'video/3gp', 'video/3gpp', "
"'video/divx', 'video/dv', 'video/fli', 'video/flv', 'video/mp2t', "
"'video/mp4', 'video/mp4v-es', 'video/mpeg', 'video/msvideo', "
@@ -614,6 +614,8 @@ static void parole_mpris_update_any (Mpris2Provider
*provider)
change_detected = TRUE;
provider->state = parole_provider_player_get_state (player);
g_variant_builder_add (&b, "{sv}", "PlaybackStatus",
mpris_Player_get_PlaybackStatus (NULL, provider));
+g_variant_builder_add (&b, "{sv}", "CanPlay",
mpris_Player_get_CanPlay(NULL, provider));
+g_variant_builder_add (&b, "{sv}", "CanPause",
mpris_Player_get_CanPause(NULL, provider));
}
g_object_get (G_OBJECT (provider->conf), "repeat", &repeat, NULL);
if(provider->saved_playbackstatus != repeat)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add seeked signal
Updating branch refs/heads/master
to d42144f794328c30c1662a40f950a10bd5e9446e (commit)
from 3d390a079a60891db42c3c9c154a69c448430326 (commit)
commit d42144f794328c30c1662a40f950a10bd5e9446e
Author: Sean Davis
Date: Sun Dec 8 16:55:46 2013 -0500
Add seeked signal
src/gst/gstmarshal.list |2 +-
src/gst/parole-gst.c | 13 +
src/gst/parole-gst.h |4
src/misc/parole-provider-player.c| 17 +
src/misc/parole-provider-player.h|3 +++
src/parole-plugin-player.c | 13 +
src/plugins/mpris2/mpris2-provider.c | 14 ++
7 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/src/gst/gstmarshal.list b/src/gst/gstmarshal.list
index 4447534..8c09ebc 100644
--- a/src/gst/gstmarshal.list
+++ b/src/gst/gstmarshal.list
@@ -1,4 +1,4 @@
VOID:OBJECT,ENUM
VOID:OBJECT,INT64
VOID:OBJECT,INT
-
+VOID:OBJECT,DOUBLE
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ea61a0e..e59112e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -147,6 +147,7 @@ enum
MEDIA_STATE,
MEDIA_PROGRESSED,
MEDIA_TAG,
+MEDIA_SEEKED,
BUFFERING,
ERROR,
DVD_CHAPTER_CHANGE,
@@ -2312,6 +2313,16 @@ parole_gst_class_init (ParoleGstClass *klass)
_gmarshal_VOID__OBJECT_INT64,
G_TYPE_NONE, 2,
G_TYPE_OBJECT, G_TYPE_INT64);
+
+signals[MEDIA_SEEKED] =
+g_signal_new ("media-seeked",
+PAROLE_TYPE_GST,
+G_SIGNAL_RUN_LAST,
+G_STRUCT_OFFSET (ParoleGstClass, media_seeked),
+NULL, NULL,
+_gmarshal_VOID__OBJECT_DOUBLE,
+G_TYPE_NONE, 1,
+G_TYPE_DOUBLE);
signals [MEDIA_TAG] =
g_signal_new ("media-tag",
@@ -2628,6 +2639,8 @@ void parole_gst_seek (ParoleGst *gst, gdouble seek)
GST_SEEK_FLAG_KEY_UNIT | GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET, (int) seek * GST_SECOND,
GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE));
+
+g_signal_emit (G_OBJECT (gst), signals [MEDIA_SEEKED], 0, seek);
}
void parole_gst_set_volume (ParoleGst *gst, gdouble volume)
diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h
index 1584339..efb596c 100644
--- a/src/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -76,6 +76,10 @@ typedef struct
void(*media_progressed) (ParoleGst *gst,
const ParoleStream *stream,
gint64 value);
+
+void(*media_seeked) (ParoleGst *gst,
+ const ParoleStream *stream,
+ gdouble value);
void(*buffering)(ParoleGst *gst,
const ParoleStream *stream,
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 7ee95eb..4496170 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -101,6 +101,23 @@ static void parole_provider_player_base_init (gpointer
klass)
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, PAROLE_TYPE_STREAM);
+
+/**
+ * ParoleProviderPlayerIface::seeked:
+ * @player: the object which received the signal.
+ * @value: the seeked position.
+ *
+ * Notifies when the stream has been manually advanced.
+ *
+ * Since: 0.6
+ **/
+g_signal_new ("seeked",
+G_TYPE_FROM_INTERFACE (klass),
+G_SIGNAL_RUN_LAST,
+G_STRUCT_OFFSET (ParoleProviderPlayerIface, seeked),
+NULL, NULL,
+g_cclosure_marshal_VOID__DOUBLE,
+G_TYPE_NONE, 1, G_TYPE_DOUBLE);
initialized = TRUE;
}
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 73ddc5f..0c93d8e 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -93,6 +93,9 @@ struct _ParoleProviderPlayerIface
/*< signals >*/
void (*tag_message) (ParoleProviderPlayer *player,
const ParoleStream *stream);
+
+void (*seeked) (ParoleProviderPlayer *player,
+
[Xfce4-commits] Populate uri schemes and uri schemes
Updating branch refs/heads/master
to 6d9c6fa9b028e6292650eba664426baebbb81666 (commit)
from f28e424562abfd1afdbb32e0023c9879b95e35ba (commit)
commit 6d9c6fa9b028e6292650eba664426baebbb81666
Author: Sean Davis
Date: Sat Nov 16 20:56:12 2013 -0500
Populate uri schemes and uri schemes
src/plugins/mpris2/mpris2-provider.c | 44 +++---
1 file changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 612193f..37986c1 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -177,21 +177,47 @@ static GVariant* mpris_Root_get_DesktopEntry (GError
**error, Mpris2Provider *pr
static GVariant* mpris_Root_get_SupportedUriSchemes (GError **error,
Mpris2Provider *provider)
{
-// TODO Complete uris schemes
return g_variant_parse(G_VARIANT_TYPE("as"),
-"['file', 'cdda']", NULL, NULL, NULL);
+"['cdda', 'dvd', 'file', 'icy', 'icyx', 'mms', 'mmsh', net', "
+"'pnm', 'rtmp', 'rtp', 'rtsp', 'uvox']", NULL, NULL, NULL);
}
static GVariant* mpris_Root_get_SupportedMimeTypes (GError **error,
Mpris2Provider *provider)
{
-// TODO Fixs mime tyme. This are of Pragha
return g_variant_parse(G_VARIANT_TYPE("as"),
-"['audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg', 'audio/mpeg3', "
-"'audio/mp3', 'application/ogg', 'application/x-ogg', 'audio/vorbis', "
-"'audio/x-vorbis', 'audio/ogg', 'audio/x-ogg', 'audio/x-flac', "
-"'video/x-ms-asf', 'audio/x-ms-wma', 'audio/x-m4a', "
-"'application/x-ape', 'audio/ape', 'audio/x-ape', "
-"'application/x-flac', 'audio/flac', 'audio/x-wav']", NULL, NULL,
NULL);
+"['application/mxf', 'application/ogg', 'application/ram', "
+"'application/sdp', 'application/vnd.apple.mpegurl', "
+"'application/vnd.ms-wpl', 'application/vnd.rn-realmedia', "
+"'application/vnd.rn-realmedia', 'application/x-extension-m4a', "
+"'application/x-extension-mp4', 'application/x-flac', "
+"'application/x-flash-video', 'application/x-matroska', "
+"'application/x-netshow-channel', 'application/x-ogg', "
+"'application/x-quicktimeplayer', 'application/x-shorten', "
+"'audio/3gpp', 'audio/ac3', 'audio/AMR', 'audio/AMR-WB', "
+"'audio/basic', 'audio/flac', 'audio/midi', 'audio/mp2', 'audio/mp4', "
+"'audio/mpeg', 'audio/ogg', 'audio/prs.sid', 'audio/vnd.rn-realaudio',
"
+"'audio/x-aiff', 'audio/x-ape', 'audio/x-flac', 'audio/x-gsm', "
+"'audio/x-it', 'audio/x-m4a', 'audio/x-matroska', 'audio/x-mod', "
+"'audio/x-mp3', 'audio/x-mpeg', 'audio/x-ms-asf', 'audio/x-ms-asx', "
+"'audio/x-ms-wax', 'audio/x-ms-wma', 'audio/x-musepack', "
+"'audio/x-pn-aiff', 'audio/x-pn-au', 'audio/x-pn-realaudio', "
+"'audio/x-pn-wav', 'audio/x-pn-windows-acm', 'audio/x-real-audio', "
+"'audio/x-realaudio', 'audio/x-s3m', 'audio/x-sbc', 'audio/x-speex', "
+"'audio/x-stm', 'audio/x-tta', 'audio/x-vorbis', 'audio/x-vorbis+ogg',
"
+"'audio/x-wav', 'audio/x-wavpack', 'audio/x-xm', "
+"'image/vnd.rn-realpix', 'image/x-pict', 'misc/ultravox', "
+"'text/x-google-video-pointer', 'video/3gp', 'video/3gpp', "
+"'video/divx', 'video/dv', 'video/fli', 'video/flv', 'video/mp2t', "
+"'video/mp4', 'video/mp4v-es', 'video/mpeg', 'video/msvideo', "
+"'video/ogg', 'video/quicktime', 'video/vivo', 'video/vnd.divx', "
+"'video/vnd.mpegurl', 'video/vnd.rn-realvideo', 'video/vnd.vivo', "
+"'video/webm', 'video/x-anim', 'video/x-avi', 'video/x-flc', "
+"'video/x-fli', 'video/x-flic', 'video/x-flv', 'video/x-m4v', "
+"'video/x-matroska', 'video/x-mpeg', 'video/x-mpeg2', "
+"'video/x-ms-asf', 'video/x-ms-asx', 'video/x-msvideo', "
+"'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wmx', "
+"'video/x-ms-wvx', 'video/x-nsv', 'video/x-ogm+ogg', "
+"'video/x-theora+ogg', 'video/x-totem-stream']", NULL, NULL, NULL);
}
/*
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add album art functionality
Updating branch refs/heads/master
to d132bc7880c30ceedcb1aaf5ed1752929680d1ee (commit)
from 9276bc68d7dca3d68590bad6ae217346b59776ae (commit)
commit d132bc7880c30ceedcb1aaf5ed1752929680d1ee
Author: Sean Davis
Date: Sun Nov 17 11:08:56 2013 -0500
Add album art functionality
src/misc/parole-stream.c | 53 +-
src/plugins/mpris2/mpris2-provider.c |7 +++--
2 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index dc403f9..2c22120 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -29,6 +29,7 @@
#include
#include
+#include
#include "parole-stream.h"
#include "parole-enum-types.h"
@@ -71,6 +72,7 @@ struct _ParoleStreamPrivate
gchar *album;
gchar *comment;
GdkPixbuf *image;
+gchar *image_uri, *previous_image;
ParoleMediaType media_type;
};
@@ -98,7 +100,8 @@ enum
PROP_ARTIST,
PROP_YEAR,
PROP_ALBUM,
-PROP_COMMENT
+PROP_COMMENT,
+PROP_IMAGE_URI
};
G_DEFINE_TYPE (ParoleStream, parole_stream, G_TYPE_OBJECT)
@@ -149,6 +152,11 @@ static void parole_stream_set_property (GObject *object,
parole_stream_get_media_type_from_uri (stream, priv->uri);
break;
}
+case PROP_IMAGE_URI:
+{
+PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = g_value_dup_string
(value);
+break;
+}
case PROP_SUBTITLES:
PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)->subtitles, value);
break;
@@ -236,6 +244,9 @@ static void parole_stream_get_property (GObject *object,
case PROP_URI:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)->uri);
break;
+case PROP_IMAGE_URI:
+g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)->image_uri);
+break;
case PROP_SUBTITLES:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)->subtitles);
break;
@@ -318,6 +329,8 @@ void
parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
{
ParoleStream *stream;
+gchar *filename = NULL;
+gint fid;
stream = PAROLE_STREAM (object);
@@ -325,9 +338,24 @@ parole_stream_set_image (GObject *object, GdkPixbuf
*pixbuf)
g_object_unref(G_OBJECT(PAROLE_STREAM_GET_PRIVATE (stream)->image));
if (pixbuf)
+{
PAROLE_STREAM_GET_PRIVATE (stream)->image = gdk_pixbuf_copy(pixbuf);
+
+/* Create a jpeg of the artwork for other components to easily access
*/
+fid = g_file_open_tmp ("parole-art-XX.jpg", &filename, NULL);
+close(fid);
+gdk_pixbuf_save (pixbuf, filename, "jpeg", NULL, "quality", "100",
NULL);
+
+PAROLE_STREAM_GET_PRIVATE (stream)->previous_image =
g_strdup(filename);
+PAROLE_STREAM_GET_PRIVATE (stream)->image_uri =
g_strdup_printf("file://%s", filename);
+g_free(filename);
+}
else
+{
PAROLE_STREAM_GET_PRIVATE (stream)->image = NULL;
+PAROLE_STREAM_GET_PRIVATE (stream)->previous_image = NULL;
+PAROLE_STREAM_GET_PRIVATE (stream)->image_uri = NULL;
+}
}
GdkPixbuf *
@@ -683,6 +711,21 @@ parole_stream_class_init (ParoleStreamClass *klass)
"Comment",
NULL,
G_PARAM_READWRITE));
+
+/**
+ * ParoleStream:image_uri:
+ *
+ * URI for the currently playing album's artwork.
+ *
+ * Since: 0.6
+ **/
+g_object_class_install_property (object_class,
+ PROP_IMAGE_URI,
+ g_param_spec_string ("image_uri",
+ "Image URI",
+ "URI for the album artwork",
+ NULL,
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParoleStreamPrivate));
}
@@ -729,4 +772,12 @@ void parole_stream_init_properties (ParoleStream *stream)
PAROLE_STREAM_FREE_STR_PROP (priv->year);
PAROLE_STREAM_FREE_STR_PROP (priv->album);
PAROLE_STREAM_FREE_STR_PROP (priv->comment);
+PAROLE_STREAM_FREE_STR_PROP (priv->image_uri);
+
+/* Remove the previous image if it exists */
+if ( PAROLE_STREAM_GET_PRIVATE (stream)->previous_image )
+{
+g_remove (PAROLE_STREAM_GET_PRIVATE (stream)->previous_image);
+}
+PAROLE_STRE
[Xfce4-commits] Implement SeekBy and SetPosition
Updating branch refs/heads/master
to ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686 (commit)
from ff441e3e265ef10dc0dca7f17e8666f3571a77d6 (commit)
commit ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686
Author: Sean Davis
Date: Sat Dec 7 16:27:07 2013 -0500
Implement SeekBy and SetPosition
src/misc/parole-provider-player.c|4 +--
src/plugins/mpris2/Makefile.am |2 ++
src/plugins/mpris2/mpris2-provider.c | 52 --
3 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index e82303e..7ee95eb 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -403,10 +403,10 @@ gboolean parole_provider_player_seek
(ParoleProviderPlayer *player, gdouble pos)
}
/**
- * parole_provider_player_get_fullscreen:
+ * parole_provider_player_get_stream_position:
* @player: a #ParoleProviderPlayer
*
- * Get fullscreen status for Parole.
+ * Get stream position (microseconds) for Parole.
*
* Since: 0.6
**/
diff --git a/src/plugins/mpris2/Makefile.am b/src/plugins/mpris2/Makefile.am
index df747d1..ba9f37d 100644
--- a/src/plugins/mpris2/Makefile.am
+++ b/src/plugins/mpris2/Makefile.am
@@ -20,6 +20,7 @@ parole_mpris2_la_SOURCES =\
parole_mpris2_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GTK_CFLAGS) \
+$(GST_INTERFACES_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
parole_mpris2_la_LDFLAGS = \
@@ -31,6 +32,7 @@ parole_mpris2_la_LDFLAGS =\
parole_mpris2_la_LIBADD = \
$(top_builddir)/src/misc/libparole.la \
$(GTK_LIBS) \
+ $(GST_LIBS) \
$(LIBXFCE4UTIL_LIBS)
#
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 3b5fb35..5b5f12a 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -24,6 +24,8 @@
#include "mpris2-provider.h"
+#include
+
static void mpris2_provider_iface_init (ParoleProviderPluginIface
*iface);
static void mpris2_provider_finalize (GObject
*object);
@@ -329,13 +331,59 @@ static void mpris_Player_Stop (GDBusMethodInvocation
*invocation, GVariant* para
static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant*
parameters, Mpris2Provider *provider)
{
-// TODO: Implement seek..
+ParoleProviderPlayer *player = provider->player;
+
+if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
+g_dbus_method_invocation_return_error_literal (invocation,
+G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
+return;
+}
+
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+
+gint64 param;
+g_variant_get(parameters, "(x)", ¶m);
+
+gint64 curr_pos = parole_provider_player_get_stream_position (player);
+gint64 seek = (curr_pos + param) / GST_MSECOND;
+
+gint64 duration;
+g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
+
+seek = CLAMP (seek, 0, duration);
+
+parole_provider_player_seek (player, seek);
+
g_dbus_method_invocation_return_value (invocation, NULL);
}
static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation,
GVariant* parameters, Mpris2Provider *provider)
{
-// TODO: Implement set position..
+ParoleProviderPlayer *player = provider->player;
+
+if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
+g_dbus_method_invocation_return_error_literal (invocation,
+G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Nothing to seek");
+return;
+}
+
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+gchar *track_id = NULL;
+
+/* Do we need to do anything with track_id? */
+gint64 param;
+g_variant_get(parameters, "(ox)", &track_id, ¶m);
+g_free(track_id);
+
+gint64 seek = param / GST_MSECOND;
+
+gint64 duration;
+g_object_get (G_OBJECT (stream), "duration", &duration, NULL);
+
+seek = CLAMP (seek, 0, duration);
+
+parole_provider_player_seek (player, seek);
+
g_dbus_method_invocation_return_value (invocation, NULL);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix Genre
Updating branch refs/heads/master
to 026ed6b8ad4fd15293b00c2c47e83bfe4165b5e2 (commit)
from 28472fbc56401e120bdd9747c2cb1e703920b872 (commit)
commit 026ed6b8ad4fd15293b00c2c47e83bfe4165b5e2
Author: Sean Davis
Date: Sun Nov 17 14:50:10 2013 -0500
Fix Genre
src/gst/parole-gst.c | 11 +++
src/misc/parole-stream.c | 24
src/plugins/mpris2/mpris2-provider.c |6 --
3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 3dc1191..e6528b0 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1280,6 +1280,7 @@ parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList
*tag)
"year", NULL,
"album", _("Audio CD"),
"comment", NULL,
+ "genre", NULL,
NULL);
parole_stream_set_image (G_OBJECT (gst->priv->stream), NULL);
@@ -1349,6 +1350,15 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
g_free (str);
}
+if ( gst_tag_list_get_string_index (tag, GST_TAG_GENRE, 0, &str) )
+{
+TRACE ("genre:%s", str);
+g_object_set (G_OBJECT (gst->priv->stream),
+ "genre", str,
+ NULL);
+g_free (str);
+}
+
if ( gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, &integer) )
{
TRACE ("track:%i", integer);
@@ -1380,6 +1390,7 @@ parole_gst_get_meta_data_unknown (ParoleGst *gst)
"year", NULL,
"album", NULL,
"comment", NULL,
+ "genre", NULL,
NULL);
parole_stream_set_image (G_OBJECT (gst->priv->stream), NULL);
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 2c22120..2744f06 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -71,6 +71,7 @@ struct _ParoleStreamPrivate
gchar *year;
gchar *album;
gchar *comment;
+gchar *genre;
GdkPixbuf *image;
gchar *image_uri, *previous_image;
@@ -101,6 +102,7 @@ enum
PROP_YEAR,
PROP_ALBUM,
PROP_COMMENT,
+PROP_GENRE,
PROP_IMAGE_URI
};
@@ -225,6 +227,9 @@ static void parole_stream_set_property (GObject *object,
case PROP_COMMENT:
PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)->comment, value);
break;
+case PROP_GENRE:
+PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)->genre, value);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -307,6 +312,9 @@ static void parole_stream_get_property (GObject *object,
case PROP_COMMENT:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)->comment);
break;
+case PROP_GENRE:
+g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)->genre);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -713,6 +721,21 @@ parole_stream_class_init (ParoleStreamClass *klass)
G_PARAM_READWRITE));
/**
+ * ParoleStream:genre:
+ *
+ * Genre.
+ *
+ * Since: 0.6
+ **/
+g_object_class_install_property (object_class,
+ PROP_GENRE,
+ g_param_spec_string ("genre",
+ "Genre",
+ "Genre",
+ NULL,
+ G_PARAM_READWRITE));
+
+/**
* ParoleStream:image_uri:
*
* URI for the currently playing album's artwork.
@@ -772,6 +795,7 @@ void parole_stream_init_properties (ParoleStream *stream)
PAROLE_STREAM_FREE_STR_PROP (priv->year);
PAROLE_STREAM_FREE_STR_PROP (priv->album);
PAROLE_STREAM_FREE_STR_PROP (priv->comment);
+PAROLE_STREAM_FREE_STR_PROP (priv->genre);
PAROLE_STREAM_FREE_STR_PROP (priv->image_uri);
/* Remove the previous image if it exists */
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 3a37389..58dbee4 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -441,7 +441,7 @@ static void handle_strings_request(GVariantBuilder *b,
const gch
[Xfce4-commits] Add fullscreen mpris2 functionality
Updating branch refs/heads/master
to e48f090c7c9c047e00a6b95dff84713599658adc (commit)
from 0e5fd5f87afcd5622ad8af083708a543fbfe7a45 (commit)
commit e48f090c7c9c047e00a6b95dff84713599658adc
Author: Sean Davis
Date: Sun Nov 17 06:55:20 2013 -0500
Add fullscreen mpris2 functionality
src/misc/parole-provider-player.c| 43 ++
src/misc/parole-provider-player.h| 10 +++
src/parole-player.c |2 +-
src/parole-plugin-player.c | 47 +
src/plugins/mpris2/mpris2-provider.c | 55 --
5 files changed, 154 insertions(+), 3 deletions(-)
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 0dff22d..659ee71 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -434,3 +434,46 @@ GtkAction
*parole_provider_player_get_action(ParoleProviderPlayer *player, Parol
{
return parole_player_get_action(action);
}
+
+/**
+ * parole_provider_player_get_fullscreen:
+ * @player: a #ParoleProviderPlayer
+ *
+ * Get fullscreen status for Parole.
+ *
+ * Since: 0.6
+ **/
+gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
+{
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
+{
+return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)->get_fullscreen) (player);
+}
+
+return FALSE;
+}
+
+/**
+ * parole_provider_player_set_fullscreen:
+ * @player: a #ParoleProviderPlayer
+ * @fullscreen: TRUE for fullscreen, FALSE for unfullscreen
+ *
+ * Set fullscreen status for Parole.
+ *
+ * Returns: TRUE if the fullscreen command succeeded, FALSE otherwise.
+ *
+ * Since: 0.6
+ **/
+gboolean parole_provider_player_set_fullscreen(ParoleProviderPlayer *player,
gboolean fullscreen)
+{
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
+{
+return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)->set_fullscreen) (player, fullscreen);
+}
+
+return FALSE;
+}
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 98bee2d..2ee85f6 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -80,6 +80,11 @@ struct _ParoleProviderPlayerIface
gboolean (*seek)(ParoleProviderPlayer *player,
gdouble pos);
+
+gboolean (*get_fullscreen) (ParoleProviderPlayer *player);
+
+gboolean (*set_fullscreen) (ParoleProviderPlayer *player,
+ gboolean fullscreen);
void (*open_media_chooser) (ParoleProviderPlayer *player);
@@ -129,6 +134,11 @@ parole_provider_player_open_media_chooser
(ParoleProviderPlayer *player);
GtkAction *parole_provider_player_get_action(ParoleProviderPlayer *player,
ParolePlayerAction action);
+gbooleanparole_provider_player_get_fullscreen(ParoleProviderPlayer
*player);
+
+gbooleanparole_provider_player_set_fullscreen(ParoleProviderPlayer
*player,
+ gboolean fullscreen);
+
G_END_DECLS
#endif /* __PAROLE_PLUGIN_IFACE_H__ */
diff --git a/src/parole-player.c b/src/parole-player.c
index ddd8561..4764c0e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3027,7 +3027,7 @@ parole_player_init (ParolePlayer *player)
*/
/* ParolePlayer Window */
player->priv->window = GTK_WIDGET (gtk_builder_get_object (builder,
"main-window"));
-g_signal_connect( G_OBJECT(player->priv->window),
+g_signal_connect_after( G_OBJECT(player->priv->window),
"window-state-event",
G_CALLBACK(parole_player_window_state_event),
PAROLE_PLAYER(player) );
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 2700cd8..8bd0922 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -52,6 +52,8 @@ struct ParolePluginPlayerPrivate
gulong state_changed;
gulong tag_message;
gboolean packed;
+
+gboolean fullscreen;
};
@@ -205,6 +207,29 @@ static void parole_plugin_player_open_media_chooser
(ParoleProviderPlayer *provi
g_object_unref (list);
}
+static gboolean parole_plugin_player_get_fullscreen (ParoleProviderPlayer
*provider)
+{
+ParolePluginPlayer *player;
+
+player = PAROLE_PLUGIN_PLAYER (provider);
+
+return player->priv->fullscreen;
+}
+
+static gboolean parole_plugin_player_s
[Xfce4-commits] Fix OpenUri to append the track to the playlist and play
Updating branch refs/heads/master
to 20f5473559b4c560985a211c1741ec9bc4e97fdf (commit)
from d42144f794328c30c1662a40f950a10bd5e9446e (commit)
commit 20f5473559b4c560985a211c1741ec9bc4e97fdf
Author: Sean Davis
Date: Sun Dec 8 17:21:33 2013 -0500
Fix OpenUri to append the track to the playlist and play
src/parole-medialist.c | 16 +++-
src/parole-medialist.h |3 +++
src/parole-plugin-player.c |9 +
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 7cd1653..0501e29 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -437,23 +437,29 @@ parole_media_list_files_opened_cb (ParoleMediaChooser
*chooser,
parole_media_list_files_open (list, files, FALSE, play);
}
-static void
-parole_media_list_location_opened_cb (ParoleOpenLocation *obj, const gchar
*location, ParoleMediaList *list)
+void
+parole_media_list_open_uri (ParoleMediaList *list, const gchar *uri)
{
ParoleFile *file;
-if ( parole_is_uri_disc (location) )
+if ( parole_is_uri_disc (uri) )
{
-g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, location);
+g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, uri);
}
else
{
-file = parole_file_new (location);
+file = parole_file_new (uri);
parole_media_list_add (list, file, FALSE, TRUE, TRUE);
}
}
static void
+parole_media_list_location_opened_cb (ParoleOpenLocation *obj, const gchar
*location, ParoleMediaList *list)
+{
+parole_media_list_open_uri(list, location);
+}
+
+static void
parole_media_list_iso_opened_cb (ParoleMediaChooser *chooser,
gchar *filename,
ParoleMediaList *list)
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index 649d4f6..548b986 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -156,6 +156,9 @@ voidparole_media_list_open
(ParoleMediaList *list);
voidparole_media_list_open_location (ParoleMediaList *list);
+voidparole_media_list_open_uri (ParoleMediaList *list,
+ const gchar *uri);
+
gbooleanparole_media_list_add_files (ParoleMediaList *list,
gchar **filenames,
gboolean enqueue);
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index ba5634f..3f22619 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -125,11 +125,12 @@ parole_plugin_player_get_stream (ParoleProviderPlayer
*provider)
static gboolean
parole_plugin_player_play_uri (ParoleProviderPlayer *provider, const gchar
*uri)
{
-ParolePluginPlayer *player;
-
-player = PAROLE_PLUGIN_PLAYER (provider);
+ParoleMediaList *list;
+
+list = PAROLE_MEDIA_LIST (parole_media_list_get ());
+parole_media_list_open_uri (list, uri);
-parole_gst_play_uri (PAROLE_GST (player->priv->gst), uri, NULL);
+g_object_unref (list);
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix GetCanSeek check and GetPosition
Updating branch refs/heads/master
to 0b59cbffe41e539f763fd05978c54697e875676a (commit)
from 8aa1d5eec7b7e089de47c0592e7d638a7e0e83c4 (commit)
commit 0b59cbffe41e539f763fd05978c54697e875676a
Author: Sean Davis
Date: Sat Dec 7 08:30:15 2013 -0500
Fix GetCanSeek check and GetPosition
src/parole-plugin-player.c |3 ++-
src/plugins/mpris2/mpris2-provider.c |4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 121dc23..5966ed1 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -207,7 +207,8 @@ parole_plugin_player_get_stream_position
(ParoleProviderPlayer *provider)
position = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst));
-return position;
+/* Return as microseconds */
+return position*100.0;
}
static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer
*provider)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index f707fe5..1fc8a7e 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -579,7 +579,6 @@ static GVariant* mpris_Player_get_CanGoPrevious (GError
**error, Mpris2Provider
static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider
*provider)
{
-// TODO: this can cause a UI-lock
/* The CanPlay property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider->player;
gint state = parole_provider_player_get_state (player);
@@ -588,7 +587,6 @@ static GVariant* mpris_Player_get_CanPlay (GError **error,
Mpris2Provider *provi
static GVariant* mpris_Player_get_CanPause (GError **error, Mpris2Provider
*provider)
{
-// TODO: this can cause a UI-lock
/* The CanPause property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider->player;
gint state = parole_provider_player_get_state (player);
@@ -612,7 +610,6 @@ static GVariant* mpris_Player_get_CanSeek (GError **error,
Mpris2Provider *provi
static GVariant* mpris_Player_get_CanControl (GError **error, Mpris2Provider
*provider)
{
-// always?
return g_variant_new_boolean(TRUE);
}
@@ -656,6 +653,7 @@ static void parole_mpris_update_any (Mpris2Provider
*provider)
g_variant_builder_add (&b, "{sv}", "PlaybackStatus",
mpris_Player_get_PlaybackStatus (NULL, provider));
g_variant_builder_add (&b, "{sv}", "CanPlay",
mpris_Player_get_CanPlay(NULL, provider));
g_variant_builder_add (&b, "{sv}", "CanPause",
mpris_Player_get_CanPause(NULL, provider));
+g_variant_builder_add (&b, "{sv}", "CanSeek",
mpris_Player_get_CanSeek(NULL, provider));
}
g_object_get (G_OBJECT (provider->conf), "repeat", &repeat, NULL);
if(provider->saved_playbackstatus != repeat)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix setting volume with mpris2
Updating branch refs/heads/master
to ff441e3e265ef10dc0dca7f17e8666f3571a77d6 (commit)
from c96da1b170d495e9313206cad4821ee22b213d70 (commit)
commit ff441e3e265ef10dc0dca7f17e8666f3571a77d6
Author: Sean Davis
Date: Sat Dec 7 10:40:07 2013 -0500
Fix setting volume with mpris2
data/interfaces/parole.ui|5 +++--
src/gst/parole-gst.c | 30 --
src/parole-player.c | 16
src/plugins/mpris2/mpris2-provider.c |3 +--
4 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index f3472d0..9918f05 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -422,8 +422,8 @@
True
image_volume_up
False
-
+
@@ -932,7 +932,7 @@
True
-False
+True
True
4
@@ -990,6 +990,7 @@ audio-volume-low-symbolic
audio-volume-medium-symbolic
True
+
False
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index b18f425..ea61a0e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2028,6 +2028,18 @@ parole_gst_conf_notify_cb (GObject *object, GParamSpec
*spec, ParoleGst *gst)
}
}
+static void
+parole_gst_conf_notify_volume_cb (GObject *conf, GParamSpec *pspec, ParoleGst
*gst)
+{
+gint volume;
+
+g_object_get (G_OBJECT (gst->priv->conf),
+ "volume", &volume,
+ NULL);
+
+parole_gst_set_volume (gst, (double)(volume / 100.0));
+}
+
static void parole_gst_get_property(GObject *object,
guint prop_id,
GValue *value,
@@ -2081,6 +2093,8 @@ static void parole_gst_set_property(GObject *object,
g_signal_connect (G_OBJECT (gst->priv->conf), "notify",
G_CALLBACK (parole_gst_conf_notify_cb), gst);
+g_signal_connect (G_OBJECT (gst->priv->conf), "notify::volume",
+G_CALLBACK (parole_gst_conf_notify_volume_cb), gst);
}
break;
default:
@@ -2618,13 +2632,17 @@ void parole_gst_seek (ParoleGst *gst, gdouble seek)
void parole_gst_set_volume (ParoleGst *gst, gdouble volume)
{
-gst_stream_volume_set_volume (GST_STREAM_VOLUME (gst->priv->playbin),
-GST_STREAM_VOLUME_FORMAT_CUBIC,
-volume);
volume = CLAMP (volume, 0.0, 1.0);
-gst->priv->volume = volume;
-
-g_object_notify (G_OBJECT (gst), "volume");
+if (gst->priv->volume != volume)
+{
+gst_stream_volume_set_volume (GST_STREAM_VOLUME (gst->priv->playbin),
+GST_STREAM_VOLUME_FORMAT_CUBIC,
+volume);
+
+gst->priv->volume = volume;
+
+g_object_notify (G_OBJECT (gst), "volume");
+}
}
gdouble parole_gst_get_volume (ParoleGst *gst)
diff --git a/src/parole-player.c b/src/parole-player.c
index a9fd374..bf0a340 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -345,6 +345,8 @@ struct ParolePlayerPrivate
GtkFileFilter *video_filter;
GtkRecentManager *recent;
+
+gdouble last_volume;
GtkWidget *window;
GtkWidget *playlist_nt;
@@ -2239,10 +2241,16 @@ void
parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value,
ParolePlayer *player)
{
parole_player_change_volume (player, value);
-if ( value > 0.0 )
-g_object_set (G_OBJECT (player->priv->conf),
- "volume", (gint)(value * 100),
- NULL);
+
+/* Do not update the value unless it has changed! */
+if ((int)(value*100) != (int)(player->priv->last_volume*100))
+{
+player->priv->last_volume = value;
+if ( value > 0.0 )
+g_object_set (G_OBJECT (player->priv->conf),
+ "volume", (gint)(value * 100),
+ NULL);
+}
}
void
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-p
[Xfce4-commits] Patch to parole-master
Updating branch refs/heads/master
to f28e424562abfd1afdbb32e0023c9879b95e35ba (commit)
from 4dcd29ac684c91d9dfdee42a74c992e6fc5bafd7 (commit)
commit f28e424562abfd1afdbb32e0023c9879b95e35ba
Author: Sean Davis
Date: Mon Nov 11 22:00:00 2013 -0500
Patch to parole-master
src/parole-conf-dialog.c | 166 --
src/parole-player.c | 30 ++---
2 files changed, 34 insertions(+), 162 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 9074e7e..63cc3d3 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -44,16 +44,6 @@
voidparole_conf_dialog_response_cb (GtkDialog *dialog,
gint response_id,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-void
-parole_conf_dialog_reset_saver_changed_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
void
parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget,
@@ -61,9 +51,8 @@ parole_conf_dialog_vis_plugin_changed_cb
(GtkComboBox *widget,
voidparole_conf_dialog_font_set_cb (GtkFontButton *button,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_subtitle_changed_cb (GObject *object,
+
+void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
GParamSpec *pspec,
gpointer *data);
@@ -85,26 +74,6 @@ voidsaturation_value_changed_cb
(GtkRange *range,
voidreset_color_clicked_cb (GtkButton *button,
ParoleConfDialog *self);
-
-voidreplace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremove_duplicated_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidstart_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremember_playlist_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidmultimedia_keys_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
/*
* End of GtkBuilder callbacks
@@ -139,65 +108,6 @@ parole_conf_dialog_destroy (GtkWidget *widget,
ParoleConfDialog *self)
gtk_widget_hide(widget);
}
-/* Replace the playlist with newly opened files */
-void replace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self->priv->conf),
- "replace-playlist", gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Remove duplicate entries from the playlist FIXME */
-void remove_duplicated_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self->priv->conf),
- "remove-duplicated", gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Automatically start playing opened files (vs. just adding them to the
playlist) */
-void start_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF
[Xfce4-commits] Ignore artwork if video
Updating branch refs/heads/master
to 5bbb38b777f6ab613880e8ad786c8535912a8e1a (commit)
from 20f5473559b4c560985a211c1741ec9bc4e97fdf (commit)
commit 5bbb38b777f6ab613880e8ad786c8535912a8e1a
Author: Sean Davis
Date: Sun Dec 8 17:40:12 2013 -0500
Ignore artwork if video
src/plugins/mpris2/mpris2-provider.c |8
1 file changed, 8 insertions(+)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 106c08c..1d99bce 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -506,6 +506,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre,
*image_uri;
gint track_id, bitrate;
gint64 duration;
+gboolean has_video;
g_object_get (G_OBJECT (stream),
"title", &title,
@@ -519,7 +520,14 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
"image_uri", &image_uri,
"track", &track_id,
"bitrate", &bitrate,
+ "has-video", &has_video,
NULL);
+
+if (has_video)
+{
+g_free(image_uri);
+image_uri = NULL;
+}
g_variant_builder_add (b, "{sv}", "mpris:trackid",
handle_get_trackid(stream));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Tweak spacing and tab sizes
Updating branch refs/heads/master
to 3d390a079a60891db42c3c9c154a69c448430326 (commit)
from 5bddac966a1fcd33dc3e4e26465e921142096a02 (commit)
commit 3d390a079a60891db42c3c9c154a69c448430326
Author: Sean Davis
Date: Sun Dec 8 07:24:43 2013 -0500
Tweak spacing and tab sizes
src/plugins/mpris2/mpris2-provider.c | 226 +-
src/plugins/mpris2/mpris2-provider.h |2 +-
2 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index c543aaa..25b3b86 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -27,7 +27,7 @@
#include
static void mpris2_provider_iface_init (ParoleProviderPluginIface
*iface);
-static void mpris2_provider_finalize (GObject
*object);
+static void mpris2_provider_finalize (GObject
*object);
#define MPRIS_NAME "org.mpris.MediaPlayer2.parole"
#define MPRIS_PATH "/org/mpris/MediaPlayer2"
@@ -66,67 +66,67 @@ PAROLE_DEFINE_TYPE_WITH_CODE (Mpris2Provider,
static const gchar mpris2xml[] =
""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-" "
-" "
-""
-" "
-" "
-""
-""
-" "
-" "
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
"";
/* some MFCisms */
#define BEGIN_INTERFACE(x) \
- if(g_quark_try_string(interface_name)==provider->interface_quarks[x]) {
+if(g_quark_try_string(interface_name)==provider->interface_quarks[x]) {
#define MAP_METHOD(x,y) \
- if(!g_strcmp0(#y, method_name)) { \
- mpris_##x##_##y(invocation, parameters, provider); return; }
+if(!g_strcmp0(#y, method_name)) { \
+mpris_##x##_##y(invocation, parameters, provider); return; }
#define PROPGET(x,y) \
- if(!g_strcmp0(#y, property_name)) \
- return mpris_##x##_get_##y(error, provider);
+if(!g_strcmp0(#y, property_name)) \
+return mpris_##x##_get_##y(error, provider);
#define PROPPUT(x,y) \
- if(g_quark_try_string(property_name)==g_quark_from_static_string(#y)) \
- mpris_##x##_put_##y(value, error, provider);
+if(g_quark_try_string(property_name)==g_quark_from_static_string(#y)) \
+mpris_##x##_put_##y(value, error, provider);
#define END_INTERFACE }
/*
@@ -137,11 +137,11 @@ static void mpris_Root_Raise (GDBusMethodInvocation
*invocation, GVariant* param
GtkWidget *widget =
parole_provider_player_get_main_window(provid
[Xfce4-commits] test
Updating branch refs/heads/master to bb3adcf5d17aadd31663ea0c305b760b4501e3a8 (commit) from 8baaf5b81080e101095ec63e48254e2fa3de5da7 (commit) commit bb3adcf5d17aadd31663ea0c305b760b4501e3a8 Author: Sean Davis Date: Wed Dec 11 07:15:38 2013 -0500 test TODO |1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 4f79584..feb3d6c 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ + === Media player === * Support scale ratio view. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make mirror button insensitive if not possible
Updating branch refs/heads/bluesabre/display-settings
to 6250ac8a0617357dd8555b31fb8489caf06a38a5 (commit)
from 6bc31cbbc3d19b44887b98db0060a98740e52c03 (commit)
commit 6250ac8a0617357dd8555b31fb8489caf06a38a5
Author: Sean Davis
Date: Wed Dec 11 05:56:51 2013 -0500
Make mirror button insensitive if not possible
dialogs/display-settings/main.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0789517..a6f90a2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1869,6 +1869,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
GObject*only_display1, *only_display2, *mirror_displays;
GObject*extend_right, *advanced, *fake_button, *label;
GError *error = NULL;
+RRMode mode;
builder = gtk_builder_new ();
@@ -1911,6 +1912,12 @@ display_settings_show_minimal_dialog (GdkDisplay
*display)
gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr->friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr->mode[1] != None);
+
+/* Can outputs be cloned? */
+if (display_settings_get_n_active_outputs () > 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode !=
None);
if (xfce_randr->mode[0] != None && xfce_randr->mode[1] != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix display mirroring
Updating branch refs/heads/bluesabre/display-settings
to 6bc31cbbc3d19b44887b98db0060a98740e52c03 (commit)
from 7b6795076e0befd9d4796a6643d8c623414fa1c9 (commit)
commit 6bc31cbbc3d19b44887b98db0060a98740e52c03
Author: Sean Davis
Date: Wed Dec 11 05:43:00 2013 -0500
Fix display mirroring
dialogs/display-settings/main.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b48c9e9..0789517 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1632,8 +1632,8 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
GtkBuilder *builder)
{
GObject *buttons;
-
-guint n;
+guintn;
+RRMode mode;
if (!gtk_toggle_button_get_active(button))
return;
@@ -1646,23 +1646,23 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
buttons = gtk_builder_get_object (builder, "buttons");
gtk_widget_set_sensitive (GTK_WIDGET(buttons), FALSE);
-
-/* Activate all inactive displays */
+
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Configure each available display for mirroring */
for (n = 0; n < xfce_randr->noutput; ++n)
{
if (xfce_randr->mode[n] == None)
-{
-xfce_randr->mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
-}
-}
-
-/* Save changes to primary display */
-xfce_randr_save_output (xfce_randr, "Default", display_channel, 0, FALSE);
+continue;
-/* Save changes to secondary display */
-xfce_randr->relation[1] = XFCE_RANDR_PLACEMENT_MIRROR;
-xfce_randr->related_to[1] = 0;
-xfce_randr_save_output (xfce_randr, "Default", display_channel, 1, TRUE);
+if (mode != None)
+xfce_randr->mode[n] = mode;
+xfce_randr->relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
+xfce_randr->related_to[n] = 0;
+xfce_randr->rotation[n] = RR_Rotate_0;
+xfce_randr_save_output (xfce_randr, "Default", display_channel,
+n, TRUE);
+}
/* Apply all changes */
xfce_randr_apply (xfce_randr, "Default", display_channel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Identify Displays button
Updating branch refs/heads/bluesabre/display-settings
to 7b6795076e0befd9d4796a6643d8c623414fa1c9 (commit)
from acaa796d552fbcfacc7bbb999d09674b6da8dbd1 (commit)
commit 7b6795076e0befd9d4796a6643d8c623414fa1c9
Author: Sean Davis
Date: Tue Dec 10 21:36:52 2013 -0500
Identify Displays button
dialogs/display-settings/display-dialog.glade | 40 +++---
dialogs/display-settings/main.c | 71 ++---
2 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index b4bbd80..db7fcef 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -273,14 +273,40 @@
True
False
-
-Configure _new
displays when connected
+
True
-True
-False
-False
-True
-True
+False
+
+
+Configure
_new displays when connected
+True
+True
+False
+False
+True
+True
+
+
+False
+True
+0
+
+
+
+
+Identify
Displays
+True
+True
+True
+False
+
+
+False
+True
+end
+1
+
+
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8c706db..b48c9e9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -154,6 +154,7 @@ static gint randr_event_base;
/* Used to identify the display */
static GHashTable *display_popups;
+gboolean show_popups = FALSE;
gboolean supports_alpha = FALSE;
@@ -1440,6 +1441,42 @@ display_settings_dialog_response (GtkDialog *dialog,
gtk_main_quit ();
}
+static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (&iter, display_popups);
+while (g_hash_table_iter_next (&iter, &key, &value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE && show_popups);
+return TRUE;
+}
+
+static void
+on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder)
+{
+show_popups = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+set_display_popups_visible (show_popups);
+}
+
static GtkWidget *
@@ -1449,7 +1486,7 @@ display_settings_dialog_new (GtkBuilder *builder)
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
GObject *combobox;
-GObject *label, *check, *mirror;
+GObject *label, *check, *mirror, *identify;
/* Get the treeview */
treeview = gtk_builder_get_object (builder, "randr-outputs");
@@ -1467,6 +1504,9 @@ display_settings_dialog_new (GtkBuilder *builder)
/* Identification popups */
display_setting_identity_popups_populate ();
+identify = gtk_builder_get_object (builder, "identify-displays");
+g_signal_connect (G_OBJECT (identify), "toggled", G_CALLBACK
(on_identify_displays_toggled), builder);
+set_display_popups_visible (show_popups);
/* Treeview selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
@@ -1707,35 +1747,6 @@ screen_on_event (GdkXEvent *xevent,
}
static void
-set_display_popups_visible(gboolean visible)
-{
-GHashTableIter iter;
-gpointer key, value;
-GtkWidget *popup;
-
-g_hash_table_iter_init (&iter, display_popups);
-while (g_hash_table_iter_next (&iter, &key, &value))
-{
-popup = (GtkWidget *) value;
-gtk_widget_set_visible(popup, visible);
-}
-}
-
-static gboolean
-focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-set_display_popups_visible(FALSE);
-return TRUE;
-
[Xfce4-commits] Add hotplug checkbox to plug dialog
Updating branch refs/heads/bluesabre/display-settings to acaa796d552fbcfacc7bbb999d09674b6da8dbd1 (commit) from 7d407c2d7beccf88fa3f1fe713f921eece5c8d1d (commit) commit acaa796d552fbcfacc7bbb999d09674b6da8dbd1 Author: Sean Davis Date: Tue Dec 10 21:13:34 2013 -0500 Add hotplug checkbox to plug dialog dialogs/display-settings/display-dialog.glade | 454 + 1 file changed, 232 insertions(+), 222 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index db0dcf5..b4bbd80 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -18,241 +18,275 @@ False 2 - + True False 12 -12 +6 - -200 -True -True -automatic -automatic -etched-in - - -True -True -False -False -False - - - - -True -True -0 - - - - + True False -7 -2 -12 -6 - - -False - - -1 -2 -6 -7 -GTK_FILL - - - - -True -False - - -1 -2 -5 -6 -GTK_FILL - - - - -True -False - - -1 -2 -4 -5 -GTK_FILL - - - - -True -False - - -1 -2 -3 -4 -GTK_FILL - - - - -False -0 -Ref_lection: -True - - -6 -7 -GTK_FILL -GTK_FILL - - - - -True -False -0 -Ro_tation: -True - - -5 -6 -GTK_FILL -GTK_FILL - - - - -True -False -0 -Refresh _rate: -True - - -4 -5 -GTK_FILL -GTK_FILL - - - - -True -False -0 -R_esolution: -True - - -3 -4 -GTK_FILL -GTK_FILL - - - - -True -False -0 -P_osition: -True - - -2 -3 -GTK_FILL -GTK_FILL - - +12 - -_Use this output + +200 True True -False -False -True -True - - -2 -GTK_FILL -GTK_FILL - - - - -_Mirror displays
[Xfce4-commits] Show/hide display popups with focus
Updating branch refs/heads/bluesabre/display-settings
to 7d407c2d7beccf88fa3f1fe713f921eece5c8d1d (commit)
from 576ceecb404297a2cc4bbc6a2134f06cab771856 (commit)
commit 7d407c2d7beccf88fa3f1fe713f921eece5c8d1d
Author: Sean Davis
Date: Tue Dec 10 05:32:22 2013 -0500
Show/hide display popups with focus
dialogs/display-settings/main.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6dcfc5b..8c706db 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1707,6 +1707,35 @@ screen_on_event (GdkXEvent *xevent,
}
static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (&iter, display_popups);
+while (g_hash_table_iter_next (&iter, &key, &value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE);
+return TRUE;
+}
+
+static void
display_settings_show_main_dialog (GdkDisplay *display)
{
GtkBuilder *builder;
@@ -1729,6 +1758,10 @@ display_settings_show_main_dialog (GdkDisplay *display)
randr_event_base,
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+/* Show/Hide the helper popups when the dialog is shown/hidden */
+g_signal_connect(G_OBJECT(dialog), "focus-out-event", G_CALLBACK
(focus_out_event), builder);
+g_signal_connect(G_OBJECT(dialog), "focus-in-event", G_CALLBACK
(focus_in_event), builder);
if (G_UNLIKELY (opt_socket_id == 0))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Ellipsize display names in the minimal dialog, and display tooltip.
Updating branch refs/heads/bluesabre/display-settings
to 908e44ea981b845092ef99630d4e4705a35e0f01 (commit)
from d24219ec41b66e51b453fdf7371dfa2dde38ee83 (commit)
commit 908e44ea981b845092ef99630d4e4705a35e0f01
Author: Sean Davis
Date: Sun Dec 16 08:34:05 2012 -0500
Ellipsize display names in the minimal dialog, and display tooltip.
dialogs/display-settings/main.c |2 ++
dialogs/display-settings/minimal-display-dialog.glade | 10 ++
2 files changed, 12 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4a6be6c..4136542 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1855,6 +1855,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
label = gtk_builder_get_object (builder, "label1");
gtk_label_set_text (GTK_LABEL (label), xfce_randr->friendly_name[0]);
+gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr->friendly_name[0]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display1),
xfce_randr->mode[0] != None);
@@ -1863,6 +1864,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
{
label = gtk_builder_get_object (builder, "label4");
gtk_label_set_text (GTK_LABEL (label),
xfce_randr->friendly_name[1]);
+gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr->friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr->mode[1] != None);
diff --git a/dialogs/display-settings/minimal-display-dialog.glade
b/dialogs/display-settings/minimal-display-dialog.glade
index 3b04070..80c3e05 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -25,9 +25,11 @@
3
+128
True
False
Only Display
1
+middle
1
@@ -38,9 +40,12 @@
+128
True
False
+Mirror
Displays
Mirror
Displays
+middle
1
@@ -53,9 +58,12 @@
+128
True
False
+Extend to the
right
Extend to the
right
+middle
2
@@ -68,9 +76,11 @@
+128
True
False
Only Display
2
+middle
3
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Added Escape key to minimal dialog to close the dialog.
Updating branch refs/heads/bluesabre/display-settings
to 0d78cf92c19943fdbcbab98457168cd1924432fa (commit)
from 9dd260d8c81e1efc90e1765607655bc64e3c14d9 (commit)
commit 0d78cf92c19943fdbcbab98457168cd1924432fa
Author: Sean Davis
Date: Fri Nov 23 10:24:44 2012 -0500
Added Escape key to minimal dialog to close the dialog.
dialogs/display-settings/main.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b120925..4a6be6c 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1770,6 +1771,19 @@ display_settings_show_main_dialog (GdkDisplay *display)
g_object_unref (G_OBJECT (builder));
}
+static gboolean
+display_settings_minimal_dialog_key_press_event(GtkWidget *widget,
+GdkEventKey *event,
+gpointer user_data)
+{
+if (event->keyval == GDK_Escape)
+{
+gtk_main_quit();
+return TRUE;
+}
+return FALSE;
+}
+
static void
display_settings_minimal_advanced_clicked (GtkButton *button,
GtkBuilder *builder)
@@ -1821,6 +1835,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
dialog = GTK_WIDGET (gtk_builder_get_object (builder, "dialog"));
cancel = GTK_WIDGET (gtk_builder_get_object (builder,
"cancel_button"));
+g_signal_connect (dialog, "key-press-event", G_CALLBACK
(display_settings_minimal_dialog_key_press_event), NULL);
g_signal_connect (dialog, "delete-event", G_CALLBACK (gtk_main_quit),
NULL);
g_signal_connect (cancel, "clicked", G_CALLBACK (gtk_main_quit), NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add step-increment for display settings, fix display settings not hiding with --xv false
Updating branch refs/heads/master
to 9c3ea8916836a04869b979924e9680adbb6fc82e (commit)
from bb2de13d11ef96ffbd36e2503cedfa5638db5fc3 (commit)
commit 9c3ea8916836a04869b979924e9680adbb6fc82e
Author: Sean Davis
Date: Wed Dec 4 21:17:38 2013 -0500
Add step-increment for display settings, fix display settings not hiding
with --xv false
data/interfaces/parole-settings.ui |2 +-
src/parole-conf-dialog.c | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/data/interfaces/parole-settings.ui
b/data/interfaces/parole-settings.ui
index 0621bb2..0574f3c 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -319,7 +319,7 @@
-
+
True
False
6
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index b9f6091..bdc1fa5 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -426,6 +426,8 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
gbooleanwith_display;
GtkWidget *switch_widget;
+GtkAdjustment *adjustment;
+GValue step_increment = {0};
builder = parole_builder_new_from_string (parole_settings_ui,
parole_settings_ui_length);
@@ -475,6 +477,18 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
gtk_scale_add_mark (GTK_SCALE (self->priv->contrast), 0,
GTK_POS_BOTTOM, NULL);
gtk_scale_add_mark (GTK_SCALE (self->priv->saturation), 0,
GTK_POS_BOTTOM, NULL);
gtk_scale_add_mark (GTK_SCALE (self->priv->hue), 0, GTK_POS_BOTTOM,
NULL);
+
+/* Set the step increment on the sliders to make them keyboard
friendly */
+g_value_init(&step_increment, G_TYPE_DOUBLE);
+g_value_set_double(&step_increment, 10.0);
+adjustment = gtk_range_get_adjustment(GTK_RANGE
(self->priv->brightness));
+g_object_set_property(G_OBJECT(adjustment), "step-increment",
&step_increment);
+adjustment = gtk_range_get_adjustment(GTK_RANGE
(self->priv->contrast));
+g_object_set_property(G_OBJECT(adjustment), "step-increment",
&step_increment);
+adjustment = gtk_range_get_adjustment(GTK_RANGE (self->priv->hue));
+g_object_set_property(G_OBJECT(adjustment), "step-increment",
&step_increment);
+adjustment = gtk_range_get_adjustment(GTK_RANGE
(self->priv->saturation));
+g_object_set_property(G_OBJECT(adjustment), "step-increment",
&step_increment);
g_object_get (G_OBJECT (self->priv->conf),
"brightness", &brightness_value,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.5.4
Updating annotated tag refs/tags/0.5.4 as new annotated tag to f3a8ef0ac9833eee7ffd5c3b7b53cc089a0704d7 (tag) succeeds 0.5.3-15-gf7d0d88 tagged by Sean Davis on 2013-12-05 00:41 +0100 Sean Davis (1): Update version numbers ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update version numbers
Updating branch refs/heads/0.5 to 17378c79a32e888df05593051e5b13bbd592bf15 (commit) from f7d0d88ab266aa7cb09918b5296859f37e893f1f (commit) commit 17378c79a32e888df05593051e5b13bbd592bf15 Author: Sean Davis Date: Wed Dec 4 18:39:56 2013 -0500 Update version numbers ChangeLog |4 ++-- configure.ac.in |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a2f6d8..1d1f4be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -2013-12-02: bluesa...@xfce.org -* Next: 0.5.4 +2013-12-04: bluesa...@xfce.org +* Bugfix release 0.5.4 * Fix loading of playlists with relative paths (bug #10436) * Fix file-filters for audio/video mimetypes (bug #10434) * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) diff --git a/configure.ac.in b/configure.ac.in index cf95cf5..1019e49 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:5:3]) +m4_define([parole_verinfo], [0:5:4]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) m4_define([parole_version_minor], [5]) -m4_define([parole_version_micro], [3]) +m4_define([parole_version_micro], [4]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updated changelog
Updating branch refs/heads/master to bb2de13d11ef96ffbd36e2503cedfa5638db5fc3 (commit) from 75c1bea7977cc73335745ef9ff33fb869ba4f14f (commit) commit bb2de13d11ef96ffbd36e2503cedfa5638db5fc3 Author: Sean Davis Date: Wed Dec 4 06:39:21 2013 -0500 Updated changelog ChangeLog |1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 09df981..182954c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * Fix loading of playlists with relative paths (bug #10436) * Add realmedia video to supported video mimetypes (bug #10434) * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) +* Fix building with enable-debug=full on some platforms (bug #10525) * Fix "Remove Duplicates" functionality. 2013-10-19: bluesa...@xfce.org ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix debug build on older platforms
Updating branch refs/heads/master
to 75c1bea7977cc73335745ef9ff33fb869ba4f14f (commit)
from 6c8f5999dedb380d28908545678b9d3e85108e01 (commit)
commit 75c1bea7977cc73335745ef9ff33fb869ba4f14f
Author: Sean Davis
Date: Tue Dec 3 20:33:06 2013 -0500
Fix debug build on older platforms
src/misc/parole-pl-parser.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 456fec1..4054ff2 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -64,13 +64,13 @@ gchar *g_substr (const gchar* string, gint start, gint end);
static gchar*
parole_filename_to_utf8(const gchar* filename)
{
-gsize read, written;
+gsize read_size, written;
gchar *utf8;
gchar *tmp = g_strdup(filename);
tmp = g_strconcat(tmp, "\0", NULL);
-utf8 = g_filename_to_utf8(tmp, -1, &read, &written, NULL);
+utf8 = g_filename_to_utf8(tmp, -1, &read_size, &written, NULL);
g_free(tmp);
return utf8;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix playlist handling of stream protocols (bug #10487)
Updating branch refs/heads/master
to a999388e235beadee923da4635560b7c9ad22369 (commit)
from 406dfc2263691b0ab90809d115542cac0c7248e2 (commit)
commit a999388e235beadee923da4635560b7c9ad22369
Author: Sean Davis
Date: Fri Nov 15 06:57:18 2013 -0500
Fix playlist handling of stream protocols (bug #10487)
src/misc/parole-pl-parser.c | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 57c495b..456fec1 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -40,6 +40,7 @@
#include
#include
+#include
#include
#include "parole-file.h"
@@ -333,6 +334,9 @@ parole_pl_parser_parse_m3u (const gchar *filename)
const gchar *split_char;
guint i;
+GRegex *regex;
+GMatchInfo *match_info;
+
file = g_file_new_for_path (filename);
path = g_path_get_dirname(filename);
@@ -362,6 +366,9 @@ parole_pl_parser_parse_m3u (const gchar *filename)
lines = g_strsplit (contents, split_char, 0);
g_free (contents);
+/* Regular expression for stream protocols, such as http:// smb:// */
+regex = g_regex_new ("^(?!/)[a-zA-Z_0-9]+://", 0, 0, NULL);
+
num_lines = g_strv_length (lines);
num_lines--; /* Drop the terminating NULL */
@@ -370,12 +377,21 @@ parole_pl_parser_parse_m3u (const gchar *filename)
if ( lines[i][0] == '\0' || lines[i][0] == '#')
continue;
+/* Absolute, local path */
if ( lines[i][0] == '/' ) {
pl_filename = g_strdup(lines[i]);
}
-
+
else {
-pl_filename = g_strjoin("/", path, lines[i], NULL);
+/* Stream protocol */
+if ( g_regex_match (regex, lines[i], 0, &match_info) ) {
+pl_filename = g_strdup(lines[i]);
+}
+
+else {
+/* Relative path */
+pl_filename = g_strjoin("/", path, lines[i], NULL);
+}
}
list = g_slist_append (list, parole_file_new (pl_filename));
@@ -384,6 +400,9 @@ parole_pl_parser_parse_m3u (const gchar *filename)
if (pl_filename)
g_free(pl_filename);
g_strfreev (lines);
+
+g_match_info_free (match_info);
+g_regex_unref (regex);
out:
g_object_unref (file);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Revert my fixes that ochosi already fixed
Updating branch refs/heads/master
to 2ffcfb81207b68cc3dab146e953dbb5619f5ad2a (commit)
from ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 (commit)
commit 2ffcfb81207b68cc3dab146e953dbb5619f5ad2a
Author: Sean Davis
Date: Mon Nov 11 05:58:35 2013 -0500
Revert my fixes that ochosi already fixed
src/parole-conf-dialog.c |5 -
src/parole-conf.c|2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index cd34c56..b9f6091 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -60,11 +60,6 @@ void
parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
ParoleConfDialog *self);
-void
-parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
voidbrightness_value_changed_cb (GtkRange *range,
ParoleConfDialog *self);
diff --git a/src/parole-conf.c b/src/parole-conf.c
index a5db768..a18e001 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -244,7 +244,7 @@ static void parole_conf_get_property (GObject *object,
}
}
-static gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
{
gchar *value = NULL;
if (g_strcmp0(prop_name, "/audio/visualization-enabled") == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/apps/parole
Updating branch refs/heads/master to ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 (commit) from 389705e7bcc206124c5716ec960291f843507a95 (commit) commit ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 Merge: 389705e b1628f0 Author: Sean Davis Date: Mon Nov 11 05:55:38 2013 -0500 Merge branch 'master' of ssh://git.xfce.org/apps/parole commit b1628f069d23ef1ebac3769e3f71d976e9b3b56e Author: Simon Steinbeiss Date: Mon Nov 11 10:36:43 2013 +0100 Fix one more build-error (missing declaration) commit 9f93b29c7fa2920626eb1b8c6c0e7d8454cbfe1d Author: Simon Steinbeiss Date: Mon Nov 11 10:33:42 2013 +0100 Add missing declaration of parole_conf_dialog_enable_vis_changed_cb commit 1768158096763a6735c06da519a06784b4c2ee62 Author: Simon Steinbeiss Date: Mon Nov 11 10:31:48 2013 +0100 Remove unused variable src/parole-conf-dialog.c |5 + src/parole-conf.c|2 ++ 2 files changed, 7 insertions(+) diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c index b9f6091..cd34c56 100644 --- a/src/parole-conf-dialog.c +++ b/src/parole-conf-dialog.c @@ -60,6 +60,11 @@ void parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget, ParoleConfDialog *self); +void +parole_conf_dialog_enable_vis_changed_cb(GObject *object, + GParamSpec *pspec, + gpointer *data); + voidbrightness_value_changed_cb (GtkRange *range, ParoleConfDialog *self); diff --git a/src/parole-conf.c b/src/parole-conf.c index 7ac6fba..a5db768 100644 --- a/src/parole-conf.c +++ b/src/parole-conf.c @@ -91,6 +91,8 @@ static void parole_conf_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); +gchar +*parole_conf_map_xfconf_property_name (const gchar *prop_name); static void parole_conf_set_property(GObject*object, guint prop_id, const GValue *value, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix build errors
Updating branch refs/heads/master
to 389705e7bcc206124c5716ec960291f843507a95 (commit)
from 7db869c5da74c8a8f6f63d4e380c348077ad39b9 (commit)
commit 389705e7bcc206124c5716ec960291f843507a95
Author: Sean Davis
Date: Mon Nov 11 05:55:25 2013 -0500
Fix build errors
src/parole-conf-dialog.c |5 -
src/parole-conf.c|2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index bf410b7..b9f6091 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -51,6 +51,10 @@ parole_conf_dialog_vis_plugin_changed_cb
(GtkComboBox *widget,
voidparole_conf_dialog_font_set_cb (GtkFontButton *button,
ParoleConfDialog *self);
+
+void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
+ GParamSpec *pspec,
+ gpointer *data);
void
parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
@@ -420,7 +424,6 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
GtkWidget *dialog;
GtkWidget *combox;
gbooleanwith_display;
-gbooleanreset_saver;
GtkWidget *switch_widget;
diff --git a/src/parole-conf.c b/src/parole-conf.c
index fe2ee55..7ac6fba 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -242,7 +242,7 @@ static void parole_conf_get_property (GObject *object,
}
}
-gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+static gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
{
gchar *value = NULL;
if (g_strcmp0(prop_name, "/audio/visualization-enabled") == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use g_object_bind_property for repeat and shuffle
Updating branch refs/heads/master
to 7db869c5da74c8a8f6f63d4e380c348077ad39b9 (commit)
from bcf12e226f93dec8018c0ad6337e149850ee1133 (commit)
commit 7db869c5da74c8a8f6f63d4e380c348077ad39b9
Author: Sean Davis
Date: Sun Nov 10 16:56:19 2013 -0500
Use g_object_bind_property for repeat and shuffle
src/parole-player.c | 30 +++---
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index a8daebd..9cb0f90 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -215,12 +215,6 @@ voidparole_player_volume_value_changed_cb
(GtkScaleButton *widget,
gbooleanparole_player_volume_scroll_event_cb(GtkWidget *widget,
GdkEventScroll *ev,
ParolePlayer *player);
-
-voidparole_player_toggle_shuffle_action_cb (GtkToggleAction *action,
- ParolePlayer *player);
-
-voidparole_player_toggle_repeat_action_cb (GtkToggleAction *action,
- ParolePlayer *player);
static void parole_player_clear_subtitles (ParolePlayer *player);
@@ -2187,21 +2181,6 @@ parole_player_menu_exit_cb (GtkWidget *widget,
ParolePlayer *player)
parole_player_delete_event_cb (NULL, NULL, player);
}
-
-void parole_player_toggle_shuffle_action_cb (GtkToggleAction *action,
ParolePlayer *player)
-{
-g_object_set (G_OBJECT (player->priv->conf),
- "shuffle", gtk_toggle_action_get_active (action),
- NULL);
-}
-
-void parole_player_toggle_repeat_action_cb (GtkToggleAction *action,
ParolePlayer *player)
-{
-g_object_set (G_OBJECT (player->priv->conf),
- "repeat", gtk_toggle_action_get_active (action),
- NULL);
-}
-
static void
parole_property_notify_cb_volume (ParoleGst *gst, GParamSpec *spec,
ParolePlayer *player)
{
@@ -3008,13 +2987,17 @@ parole_player_init (ParolePlayer *player)
/* Toggle Repeat */
player->priv->toggle_repeat_action =
gtk_toggle_action_new("toggle_repeat_action", _("_Repeat"), _("Repeat"), NULL);
gtk_action_set_icon_name(GTK_ACTION(player->priv->toggle_repeat_action),
"media-playlist-repeat-symbolic");
-g_signal_connect(G_OBJECT(player->priv->toggle_repeat_action), "activate",
G_CALLBACK(parole_player_toggle_repeat_action_cb), player);
+g_object_bind_property(G_OBJECT (player->priv->conf), "repeat",
+ player->priv->toggle_repeat_action, "active",
+ G_BINDING_BIDIRECTIONAL);
gtk_action_set_sensitive(GTK_ACTION(player->priv->toggle_repeat_action),
TRUE);
/* Toggle Shuffle */
player->priv->toggle_shuffle_action =
gtk_toggle_action_new("toggle_shuffle_action", _("_Shuffle"), _("Shuffle"),
NULL);
gtk_action_set_icon_name(GTK_ACTION(player->priv->toggle_shuffle_action),
"media-playlist-shuffle-symbolic");
-g_signal_connect(G_OBJECT(player->priv->toggle_shuffle_action),
"activate", G_CALLBACK(parole_player_toggle_shuffle_action_cb), player);
+g_object_bind_property(G_OBJECT (player->priv->conf), "shuffle",
+ player->priv->toggle_shuffle_action, "active",
+ G_BINDING_BIDIRECTIONAL);
gtk_action_set_sensitive(GTK_ACTION(player->priv->toggle_shuffle_action),
TRUE);
@@ -3312,6 +3295,7 @@ parole_player_init (ParolePlayer *player)
NULL);
gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume),
(gdouble) (volume/100.));
+
/*
* Pack the playlist.
*/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] use g_object_bind_property in parole-conf-dialog
Updating branch refs/heads/master
to 554ce74adbe4b4562ca0fc422175fac7f09b0d29 (commit)
from 1bfa7e83469d26a13ac30649de9bfe893763c930 (commit)
commit 554ce74adbe4b4562ca0fc422175fac7f09b0d29
Author: Sean Davis
Date: Sun Nov 10 14:55:35 2013 -0500
use g_object_bind_property in parole-conf-dialog
src/parole-conf-dialog.c | 165 +++---
1 file changed, 25 insertions(+), 140 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 9074e7e..bf410b7 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -44,16 +44,6 @@
voidparole_conf_dialog_response_cb (GtkDialog *dialog,
gint response_id,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-void
-parole_conf_dialog_reset_saver_changed_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
void
parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget,
@@ -61,11 +51,6 @@ parole_conf_dialog_vis_plugin_changed_cb
(GtkComboBox *widget,
voidparole_conf_dialog_font_set_cb (GtkFontButton *button,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_subtitle_changed_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
void
parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
@@ -85,26 +70,6 @@ voidsaturation_value_changed_cb
(GtkRange *range,
voidreset_color_clicked_cb (GtkButton *button,
ParoleConfDialog *self);
-
-voidreplace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremove_duplicated_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidstart_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremember_playlist_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidmultimedia_keys_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
/*
* End of GtkBuilder callbacks
@@ -139,65 +104,6 @@ parole_conf_dialog_destroy (GtkWidget *widget,
ParoleConfDialog *self)
gtk_widget_hide(widget);
}
-/* Replace the playlist with newly opened files */
-void replace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self->priv->conf),
- "replace-playlist", gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Remove duplicate entries from the playlist FIXME */
-void remove_duplicated_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self->priv->conf),
- "remove-duplicated", gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Automatically start playing opened files (vs. just adding them to the
playlist) */
-void start_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self->priv->
[Xfce4-commits] Fix 2-way syncing with parole-conf
Updating branch refs/heads/master
to bcf12e226f93dec8018c0ad6337e149850ee1133 (commit)
from 554ce74adbe4b4562ca0fc422175fac7f09b0d29 (commit)
commit bcf12e226f93dec8018c0ad6337e149850ee1133
Author: Sean Davis
Date: Sun Nov 10 15:55:12 2013 -0500
Fix 2-way syncing with parole-conf
src/parole-conf.c | 64 -
1 file changed, 63 insertions(+), 1 deletion(-)
diff --git a/src/parole-conf.c b/src/parole-conf.c
index f5e8683..fe2ee55 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -242,6 +242,68 @@ static void parole_conf_get_property (GObject *object,
}
}
+gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+{
+gchar *value = NULL;
+if (g_strcmp0(prop_name, "/audio/visualization-enabled") == 0)
+value = g_strdup("vis-enabled");
+if (g_strcmp0(prop_name, "/audio/visualization-name") == 0)
+value = g_strdup("vis-name");
+if (g_strcmp0(prop_name, "/audio/volume") == 0)
+value = g_strdup("volume");
+if (g_strcmp0(prop_name, "/folders/last-used-media") == 0)
+value = g_strdup("media-chooser-folder");
+if (g_strcmp0(prop_name, "/parole/multimedia-keys") == 0)
+value = g_strdup("multimedia-keys");
+if (g_strcmp0(prop_name, "/parole/plugins") == 0)
+value = g_strdup("plugins");
+if (g_strcmp0(prop_name, "scan-recursive") == 0)
+value = g_strdup("/parole/scan-recursive");
+if (g_strcmp0(prop_name, "/playlist/remember-playlist") == 0)
+value = g_strdup("remember-playlist");
+if (g_strcmp0(prop_name, "/playlist/remove-duplicates") == 0)
+value = g_strdup("remove-duplicated");
+if (g_strcmp0(prop_name, "/playlist/repeat") == 0)
+value = g_strdup("repeat");
+if (g_strcmp0(prop_name, "/playlist/replace-playlist") == 0)
+value = g_strdup("replace-playlist");
+if (g_strcmp0(prop_name, "/playlist/show-playlist") == 0)
+value = g_strdup("showhide-playlist");
+if (g_strcmp0(prop_name, "/playlist/shuffle") == 0)
+value = g_strdup("shuffle");
+if (g_strcmp0(prop_name, "/playlist/play-opened-files") == 0)
+value = g_strdup("play-opened-files");
+if (g_strcmp0(prop_name, "/subtitles/enabled") == 0)
+value = g_strdup("enable-subtitle");
+if (g_strcmp0(prop_name, "/subtitles/encoding") == 0)
+value = g_strdup("subtitle-encoding");
+if (g_strcmp0(prop_name, "/subtitles/font") == 0)
+value = g_strdup("subtitle-font");
+if (g_strcmp0(prop_name, "/video/aspect-ratio") == 0)
+value = g_strdup("aspect-ratio");
+if (g_strcmp0(prop_name, "/video/brightness") == 0)
+value = g_strdup("brightness");
+if (g_strcmp0(prop_name, "/video/contrast") == 0)
+value = g_strdup("contrast");
+if (g_strcmp0(prop_name, "/video/disable-screensaver") == 0)
+value = g_strdup("reset-saver");
+if (g_strcmp0(prop_name, "/video/enable-xv") == 0)
+value = g_strdup("enable-xv");
+if (g_strcmp0(prop_name, "/video/hue") == 0)
+value = g_strdup("hue");
+if (g_strcmp0(prop_name, "/video/saturation") == 0)
+value = g_strdup("saturation");
+if (g_strcmp0(prop_name, "/window/height") == 0)
+value = g_strdup("window-height");
+if (g_strcmp0(prop_name, "/window/minimized") == 0)
+value = g_strdup("minimized");
+if (g_strcmp0(prop_name, "/window/maximized") == 0)
+value = g_strdup("window-maximized");
+if (g_strcmp0(prop_name, "/window/width") == 0)
+value = g_strdup("window-width");
+return value;
+}
+
/**
* parole_conf_prop_changed:
* @channel : the #XfconfChannel where settings are stored.
@@ -259,7 +321,7 @@ static void parole_conf_prop_changed(XfconfChannel
*channel,
GParamSpec *pspec;
/* check if the property exists and emit change */
-pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf), prop_name
+ 1);
+pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf),
parole_conf_map_xfconf_property_name(prop_name));
if (G_LIKELY (pspec != NULL))
g_object_notify_by_pspec (G_OBJECT (conf), pspec);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove rhythmbox comments
Updating branch refs/heads/master
to 1bfa7e83469d26a13ac30649de9bfe893763c930 (commit)
from 4812174d4b580f1fdb4101d9f5be405a7099deb5 (commit)
commit 1bfa7e83469d26a13ac30649de9bfe893763c930
Author: Sean Davis
Date: Sat Nov 9 09:55:43 2013 -0500
Remove rhythmbox comments
src/parole-medialist.c | 36 +---
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index bd12a27..c07671b 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1491,37 +1491,27 @@ parole_media_list_playing_cell_data_func
(GtkTreeViewColumn *column,
GtkTreeIter *iter,
GtkWidget *view)
{
- //RhythmDBEntry *entry;
const char *name = NULL;
- //entry = rhythmdb_query_model_iter_to_entry (view->priv->model, iter);
-
- //if (entry == NULL) {
- // return;
- //}
gint state = 0;
gtk_tree_model_get (tree_model, iter, STATE_COL, &state, -1);
- //if (entry == view->priv->playing_entry) {
- switch (state) {
- case PAROLE_MEDIA_STATE_NONE:
- name = NULL;
- break;
- case PAROLE_MEDIA_STATE_PAUSED:
- name = "media-playback-pause-symbolic";
- break;
- case PAROLE_MEDIA_STATE_PLAYING:
- name = "media-playback-start-symbolic";
- break;
- default:
- name = NULL;
- break;
- // }
+ switch (state) {
+ case PAROLE_MEDIA_STATE_NONE:
+ name = NULL;
+ break;
+ case PAROLE_MEDIA_STATE_PAUSED:
+ name = "media-playback-pause-symbolic";
+ break;
+ case PAROLE_MEDIA_STATE_PLAYING:
+ name = "media-playback-start-symbolic";
+ break;
+ default:
+ name = NULL;
+ break;
}
g_object_set (renderer, "icon-name", name, NULL);
-
- //rhythmdb_entry_unref (entry);
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Properly use symbolic icons in the playlist
Updating branch refs/heads/master
to 4812174d4b580f1fdb4101d9f5be405a7099deb5 (commit)
from 3436ff74f9c6bd8376903f0b9b184b8876321c5f (commit)
commit 4812174d4b580f1fdb4101d9f5be405a7099deb5
Author: Sean Davis
Date: Sat Nov 9 09:52:15 2013 -0500
Properly use symbolic icons in the playlist
src/parole-medialist.c | 66 ++--
src/parole-medialist.h | 13 +++---
src/parole-player.c| 43 ---
3 files changed, 79 insertions(+), 43 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 7cd1653..bd12a27 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -322,7 +322,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
NAME_COL, parole_file_get_display_name (file),
DATA_COL, file,
LENGTH_COL, parole_taglibc_get_media_length (file),
-PIXBUF_COL, NULL,
+STATE_COL, PAROLE_MEDIA_STATE_NONE,
-1);
if ( emit || select_row )
@@ -1485,14 +1485,54 @@ parole_media_list_class_init (ParoleMediaListClass
*klass)
}
static void
+parole_media_list_playing_cell_data_func (GtkTreeViewColumn *column,
+ GtkCellRenderer
*renderer,
+ GtkTreeModel
*tree_model,
+ GtkTreeIter *iter,
+ GtkWidget *view)
+{
+ //RhythmDBEntry *entry;
+ const char *name = NULL;
+
+ //entry = rhythmdb_query_model_iter_to_entry (view->priv->model, iter);
+
+ //if (entry == NULL) {
+ // return;
+ //}
+gint state = 0;
+gtk_tree_model_get (tree_model, iter, STATE_COL, &state, -1);
+
+ //if (entry == view->priv->playing_entry) {
+ switch (state) {
+ case PAROLE_MEDIA_STATE_NONE:
+ name = NULL;
+ break;
+ case PAROLE_MEDIA_STATE_PAUSED:
+ name = "media-playback-pause-symbolic";
+ break;
+ case PAROLE_MEDIA_STATE_PLAYING:
+ name = "media-playback-start-symbolic";
+ break;
+ default:
+ name = NULL;
+ break;
+ // }
+ }
+
+ g_object_set (renderer, "icon-name", name, NULL);
+
+ //rhythmdb_entry_unref (entry);
+}
+
+static void
parole_media_list_setup_view (ParoleMediaList *list)
{
GtkTreeSelection *sel, *disc_sel;
GtkListStore *list_store, *disc_list_store;
GtkCellRenderer *renderer, *disc_renderer;
-list_store = gtk_list_store_new (COL_NUMBERS, GDK_TYPE_PIXBUF,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
-disc_list_store = gtk_list_store_new (COL_NUMBERS, GDK_TYPE_PIXBUF,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
+list_store = gtk_list_store_new (COL_NUMBERS, G_TYPE_INT, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_OBJECT);
+disc_list_store = gtk_list_store_new (COL_NUMBERS, G_TYPE_INT,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT);
gtk_tree_view_set_model (GTK_TREE_VIEW (list->priv->view),
GTK_TREE_MODEL(list_store));
gtk_tree_view_set_model (GTK_TREE_VIEW (list->priv->disc_view),
GTK_TREE_MODEL(disc_list_store));
@@ -1504,11 +1544,21 @@ parole_media_list_setup_view (ParoleMediaList *list)
renderer = gtk_cell_renderer_pixbuf_new ();
disc_renderer = gtk_cell_renderer_pixbuf_new ();
+g_object_set (renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
+g_object_set (disc_renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
gtk_tree_view_column_pack_start(list->priv->col, renderer, FALSE);
gtk_tree_view_column_pack_start(list->priv->disc_col, disc_renderer,
FALSE);
-gtk_tree_view_column_set_attributes(list->priv->col, renderer, "pixbuf",
PIXBUF_COL, NULL);
-gtk_tree_view_column_set_attributes(list->priv->disc_col, disc_renderer,
"pixbuf", PIXBUF_COL, NULL);
+gtk_tree_view_column_set_cell_data_func (list->priv->col, renderer,
+(GtkTreeCellDataFunc)
+
parole_media_list_playing_cell_data_func,
+list->priv->view,
+NULL);
+gtk_tree_view_column_set_cell_data_func (list->priv->disc_col,
disc_renderer,
+(GtkTreeCellDataFunc)
+
[Xfce4-commits] Do not handle keypress with ALT modifier (fixes bug #10462)
Updating branch refs/heads/master
to 1fa000dde70e4a1250f9b54fd20f9b9d7bb74f70 (commit)
from decba160008b46eba4bc84e4fffec8300dbb02c9 (commit)
commit 1fa000dde70e4a1250f9b54fd20f9b9d7bb74f70
Author: Sean Davis
Date: Sun Nov 3 21:50:33 2013 -0500
Do not handle keypress with ALT modifier (fixes bug #10462)
src/parole-player.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/parole-player.c b/src/parole-player.c
index 43785fc..0fabf32 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2474,6 +2474,9 @@ parole_player_handle_key_press (GdkEventKey *ev,
ParolePlayer *player)
return FALSE;
}
}
+
+if (ev->state & GDK_MOD1_MASK)
+return FALSE;
switch (ev->keyval)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix None string not translated after subtitle clear
Updating branch refs/heads/master
to 5d474929f70cb56da89b6d597f1c80ef8a87f460 (commit)
from d69a4206a65feee38e67abd7cc56e9dbff8cd459 (commit)
commit 5d474929f70cb56da89b6d597f1c80ef8a87f460
Author: Sean Davis
Date: Sat Nov 2 08:27:46 2013 -0400
Fix None string not translated after subtitle clear
src/parole-player.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index e3b1067..43785fc 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -675,7 +675,6 @@ parole_player_clear_chapters (ParolePlayer *player)
/* Clear the chapter menu options */
menu_items = gtk_container_get_children( GTK_CONTAINER
(player->priv->chapters_menu) );
-
//gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->subtitles_group),
TRUE);
for (menu_iter = menu_items; menu_iter != NULL; menu_iter =
g_list_next(menu_iter))
{
@@ -723,7 +722,7 @@ parole_player_clear_subtitles (ParolePlayer *player)
/* Clear the InfoBar Combobox */
gtk_list_store_clear(player->priv->liststore_subtitles);
gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles),
&iter);
-gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles),
&iter, 0, "None", -1);
+gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles),
&iter, 0, _("None"), -1);
gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles),
0 );
/* Clear the subtitle menu options */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix order of right-click menu to be consistent with the rest of the application
Updating branch refs/heads/master to d69a4206a65feee38e67abd7cc56e9dbff8cd459 (commit) from f7b40ffc15a5b6bcc53cbee1affe276e4499401c (commit) commit d69a4206a65feee38e67abd7cc56e9dbff8cd459 Author: Sean Davis Date: Sat Nov 2 08:12:24 2013 -0400 Fix order of right-click menu to be consistent with the rest of the application src/parole-player.c |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index 5bb2c8e..e3b1067 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2050,15 +2050,15 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); /* - * Next item in playlist. + * Previous item in playlist. */ -mi = gtk_action_create_menu_item(player->priv->media_next_action); +mi = gtk_action_create_menu_item(player->priv->media_previous_action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); /* - * Previous item in playlist. + * Next item in playlist. */ -mi = gtk_action_create_menu_item(player->priv->media_previous_action); +mi = gtk_action_create_menu_item(player->priv->media_next_action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); /* ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update changelog
Updating branch refs/heads/master to ea18d8439479ffc991fe85c174cd7cb0eed6a5cb (commit) from 881b57d087518a8e35c47eef1c5bd128f52850a2 (commit) commit ea18d8439479ffc991fe85c174cd7cb0eed6a5cb Author: Sean Davis Date: Wed Oct 30 00:05:52 2013 -0400 Update changelog ChangeLog |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6f6bc4..09df981 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ -2013-10-20: bluesa...@xfce.org -* Fix untranslatable strings (bug #10418)" +2013-10-30: bluesa...@xfce.org +* Fix untranslatable strings (bug #10418) +* Fix loading of playlists with relative paths (bug #10436) +* Add realmedia video to supported video mimetypes (bug #10434) +* Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) +* Fix "Remove Duplicates" functionality. 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update changelog
Updating branch refs/heads/0.5 to 4a14bbf081d1ee7986e67b0cd9c6f34280df5cda (commit) from 95f32035b80c1ba8d06a7006d922560ce83ae432 (commit) commit 4a14bbf081d1ee7986e67b0cd9c6f34280df5cda Author: Sean Davis Date: Wed Oct 30 00:04:07 2013 -0400 Update changelog ChangeLog |7 +++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7c2091c..b468449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-10-30: bluesa...@xfce.org +* Next: 0.5.4 +* Fix loading of playlists with relative paths (bug #10436) +* Add realmedia video to supported video mimetypes (bug #10434) +* Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) +* Fix "Remove Duplicates" functionality. + 2013-08-03: bluesa...@xfce.org * Bugfix release 0.5.3 * Fix “Remember playlist” option in GUI not working (bug #10269) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add realmedia video to supported video mimetypes (bug #10434)
Updating branch refs/heads/0.5
to 252a2c50057c20b6299a7c11e20a1a6514f1a48f (commit)
from 74815a4b1e1cce4a81b0d29ec9c7e8eac4682b6e (commit)
commit 252a2c50057c20b6299a7c11e20a1a6514f1a48f
Author: Sean Davis
Date: Tue Oct 29 23:45:50 2013 -0400
Add realmedia video to supported video mimetypes (bug #10434)
data/mime/mime-functions.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 370f35b..118040b 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -9,6 +9,6 @@ get_audio_mimetypes ()
get_video_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v
"application/x-quicktime-media-link" | grep -v "application/smil" | grep -v
"application/smil+xml" | grep -v "application/x-smil" | grep -v
"application/xspf+xml" | grep -v x-scheme-handler/`
- MIMETYPES="$MIMETYPES audio/x-pn-realaudio"
+ MIMETYPES="$MIMETYPES audio/x-pn-realaudio application/vnd.rn-realmedia"
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix if/else for plugin installer
Updating branch refs/heads/0.5
to 4f17bbef7315210f8022926427dd2935de1f5629 (commit)
from 252a2c50057c20b6299a7c11e20a1a6514f1a48f (commit)
commit 4f17bbef7315210f8022926427dd2935de1f5629
Author: Sean Davis
Date: Tue Oct 29 23:51:16 2013 -0400
Fix if/else for plugin installer
src/gst/parole-gst.c | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index f828448..336ee5b 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1582,7 +1582,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
#if defined(__linux__)
GTK_MESSAGE_QUESTION,
-#elif defined(__FreeBSD__)
+#else
GTK_MESSAGE_WARNING,
#endif
GTK_BUTTONS_NONE,
@@ -1590,24 +1590,23 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
_("Additional software is required.")
));
-#if defined(__linux__)
gtk_dialog_add_buttons( GTK_DIALOG(dialog),
+#if defined(__linux__)
_("Don't Install"),
GTK_RESPONSE_REJECT,
_("Install"),
GTK_RESPONSE_ACCEPT,
-NULL );
-#elif defined(__FreeBSD__)
-gtk_dialog_add_button( GTK_DIALOG(dialog),
-GTK_STOCK_OK,
-GTK_RESPONSE_ACCEPT);
+#else
+_("OK"),
+GTK_RESPONSE_ACCEPT,
#endif
+NULL );
gtk_message_dialog_format_secondary_markup(dialog,
#if defined(__linux__)
"Parole needs %s to play
this file.\n"
"It can be installed
automatically.",
-#elif defined(__FreeBSD__)
+#else
"Parole needs %s to play
this file.",
#endif
desc);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make remove-duplicates work again
Updating branch refs/heads/0.5
to 95f32035b80c1ba8d06a7006d922560ce83ae432 (commit)
from 4f17bbef7315210f8022926427dd2935de1f5629 (commit)
commit 95f32035b80c1ba8d06a7006d922560ce83ae432
Author: Sean Davis
Date: Tue Oct 29 23:58:58 2013 -0400
Make remove-duplicates work again
src/parole-medialist.c | 67 +---
1 file changed, 52 insertions(+), 15 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 85aad22..f63eadd 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -260,31 +260,67 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
GtkTreeIter iter;
gint nch;
+/* Objects used for the remove-duplicates functionality. */
+gchar *filename;
+ParoleFile *row_file;
+gboolean remove_duplicates;
+g_object_get (G_OBJECT (list->priv->conf),
+ "remove-duplicated", &remove_duplicates,
+ NULL);
+
+/* Set the list_store variable based on with store we're viewing. */
if (disc)
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW
(list->priv->disc_view)));
else
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW
(list->priv->view)));
+
+/* Remove duplicates functionality. If the file being added is already in
the
+ * playlist, remove it from its current position in the playlist before
+ * adding it again. */
+if (!disc && remove_duplicates && gtk_tree_model_iter_n_children
(GTK_TREE_MODEL(list_store), NULL) != 0)
+{
+filename = g_strdup(parole_file_get_file_name(file));
+
+/* Check the first row */
+gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter);
+gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL,
&row_file, -1);
+if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+{
+gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+}
+
+/* Check subsequent rows */
+while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)) {
+gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL,
&row_file, -1);
+if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+{
+gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+}
+}
+
+g_object_unref(row_file);
+}
+/* Add the file to the playlist */
gtk_list_store_append (list_store, &iter);
-
gtk_list_store_set (list_store,
- &iter,
- NAME_COL, parole_file_get_display_name (file),
- DATA_COL, file,
- LENGTH_COL, parole_taglibc_get_media_length (file),
- PIXBUF_COL, NULL,
- -1);
+&iter,
+NAME_COL, parole_file_get_display_name (file),
+DATA_COL, file,
+LENGTH_COL, parole_taglibc_get_media_length (file),
+PIXBUF_COL, NULL,
+-1);
if ( emit || select_row )
{
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
- if ( select_row )
- parole_media_list_select_path (list, disc, path);
- gtk_tree_path_free (path);
- if ( emit )
- g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
- gtk_tree_row_reference_free (row);
+path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
+row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
+if ( select_row )
+parole_media_list_select_path (list, disc, path);
+gtk_tree_path_free (path);
+if ( emit )
+g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
+gtk_tree_row_reference_free (row);
}
/*
@@ -293,6 +329,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
*/
g_object_unref (file);
+/* Update the playlist count. */
if (disc)
nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL
(list->priv->disc_store), NULL);
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add realmedia video to supported video mimetypes (bug #10434)
Updating branch refs/heads/master
to 881b57d087518a8e35c47eef1c5bd128f52850a2 (commit)
from 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5 (commit)
commit 881b57d087518a8e35c47eef1c5bd128f52850a2
Author: Sean Davis
Date: Mon Oct 28 21:42:08 2013 -0400
Add realmedia video to supported video mimetypes (bug #10434)
data/mime/mime-functions.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 370f35b..118040b 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -9,6 +9,6 @@ get_audio_mimetypes ()
get_video_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v
"application/x-quicktime-media-link" | grep -v "application/smil" | grep -v
"application/smil+xml" | grep -v "application/x-smil" | grep -v
"application/xspf+xml" | grep -v x-scheme-handler/`
- MIMETYPES="$MIMETYPES audio/x-pn-realaudio"
+ MIMETYPES="$MIMETYPES audio/x-pn-realaudio application/vnd.rn-realmedia"
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix if/else for plugin installer
Updating branch refs/heads/master
to 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5 (commit)
from 2983de5d5e8c527e3da9659046881c5e8b0c567e (commit)
commit 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5
Author: Sean Davis
Date: Mon Oct 28 21:28:42 2013 -0400
Fix if/else for plugin installer
src/gst/parole-gst.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 8ca98c9..7fc18cd 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1484,7 +1484,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
#if defined(__linux__)
GTK_MESSAGE_QUESTION,
-#elif defined(__FreeBSD__)
+#else
GTK_MESSAGE_WARNING,
#endif
GTK_BUTTONS_NONE,
@@ -1492,24 +1492,23 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
_("Additional software is required.")
));
-#if defined(__linux__)
gtk_dialog_add_buttons( GTK_DIALOG(dialog),
+#if defined(__linux__)
_("Don't Install"),
GTK_RESPONSE_REJECT,
_("Install"),
GTK_RESPONSE_ACCEPT,
-NULL );
-#elif defined(__FreeBSD__)
-gtk_dialog_add_button( GTK_DIALOG(dialog),
+#else
_("OK"),
-GTK_RESPONSE_ACCEPT);
+GTK_RESPONSE_ACCEPT,
#endif
+NULL );
gtk_message_dialog_format_secondary_markup(dialog,
#if defined(__linux__)
_("Parole needs %s to play
this file.\n"
"It can be installed
automatically."),
-#elif defined(__FreeBSD__)
+#else
_("Parole needs %s to play
this file."),
#endif
desc);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make remove-duplicates work again
Updating branch refs/heads/master
to b93745033f6e6a89c5e7a0245f3a60143c7ed5fb (commit)
from 2af855073ebf480f6781950b498783307767fcfe (commit)
commit b93745033f6e6a89c5e7a0245f3a60143c7ed5fb
Author: Sean Davis
Date: Sat Oct 26 11:38:29 2013 -0400
Make remove-duplicates work again
src/parole-medialist.c | 45 +++--
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index ad87c34..7cd1653 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -274,13 +274,49 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
GtkTreeIter iter;
gint nch;
+/* Objects used for the remove-duplicates functionality. */
+gchar *filename;
+ParoleFile *row_file;
+gboolean remove_duplicates;
+g_object_get (G_OBJECT (list->priv->conf),
+ "remove-duplicated", &remove_duplicates,
+ NULL);
+
+/* Set the list_store variable based on with store we're viewing. */
if (disc)
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW
(list->priv->disc_view)));
else
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW
(list->priv->view)));
+
+/* Remove duplicates functionality. If the file being added is already in
the
+ * playlist, remove it from its current position in the playlist before
+ * adding it again. */
+if (!disc && remove_duplicates && gtk_tree_model_iter_n_children
(GTK_TREE_MODEL(list_store), NULL) != 0)
+{
+filename = g_strdup(parole_file_get_file_name(file));
+
+/* Check the first row */
+gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter);
+gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL,
&row_file, -1);
+if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+{
+gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+}
+
+/* Check subsequent rows */
+while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)) {
+gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL,
&row_file, -1);
+if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+{
+gtk_list_store_remove (GTK_LIST_STORE(list_store), &iter);
+}
+}
+
+g_object_unref(row_file);
+}
+/* Add the file to the playlist */
gtk_list_store_append (list_store, &iter);
-
gtk_list_store_set (list_store,
&iter,
NAME_COL, parole_file_get_display_name (file),
@@ -307,11 +343,8 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
*/
g_object_unref (file);
-if (disc)
-nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL
(list->priv->disc_store), NULL);
-else
-nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL
(list->priv->store), NULL);
-
+/* Update the playlist count. */
+nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list_store), NULL);
parole_media_list_set_playlist_count(list, nch);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix untranslatable strings (bug #10418)
Updating branch refs/heads/master
to 042ad465534068605a8025e5d71e19342751a619 (commit)
from 0d439ef5d9f572d7716c165f3409faf737a05ab1 (commit)
commit 042ad465534068605a8025e5d71e19342751a619
Author: Sean Davis
Date: Sun Oct 20 10:31:18 2013 -0400
Fix untranslatable strings (bug #10418)
ChangeLog |3 +++
data/interfaces/parole.ui | 12 ++--
src/gst/parole-gst.c |6 +++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e44e761..e6f6bc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-10-20: bluesa...@xfce.org
+* Fix untranslatable strings (bug #10418)"
+
2013-10-19: bluesa...@xfce.org
* Development release 0.5.90
* Completed port to GTK+3
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index c13c361..f3472d0 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -163,7 +163,7 @@
False
-_Open…
+_Open…
True
False
True
@@ -217,7 +217,7 @@
-Insert Disk
+Insert
Disk
True
False
False
@@ -233,7 +233,7 @@
-_Quit
+_Quit
True
False
True
@@ -422,8 +422,8 @@
True
image_volume_up
False
-
+
@@ -467,7 +467,7 @@
False
-_Fullscreen
+_Fullscreen
True
False
True
@@ -672,7 +672,7 @@
-_About
+_About
True
False
True
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 878deff..8ca98c9 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1507,10 +1507,10 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
gtk_message_dialog_format_secondary_markup(dialog,
#if defined(__linux__)
- "Parole needs %s to play
this file.\n"
- "It can be installed
automatically.",
+ _("Parole needs %s to play
this file.\n"
+ "It can be installed
automatically."),
#elif defined(__FreeBSD__)
- "Parole needs %s to play
this file.",
+ _("Parole needs %s to play
this file."),
#endif
desc);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.5.90
Updating annotated tag refs/tags/0.5.90 as new annotated tag to 337b108810c2240954abf9593247e4b8a7f1e52f (tag) succeeds 0.5.3-201-g4f0c64c tagged by Sean Davis on 2013-10-19 16:16 +0200 Sean Davis (1): Update details for parole development release 0.5.90 on the way to 0.6.0 stable release ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update details for parole development release 0.5.90 on the way to 0.6.0 stable release
Updating branch refs/heads/master to 0d439ef5d9f572d7716c165f3409faf737a05ab1 (commit) from 4f0c64d1ea9349528d27d7993bc10098ffdc (commit) commit 0d439ef5d9f572d7716c165f3409faf737a05ab1 Author: Sean Davis Date: Sat Oct 19 10:14:52 2013 -0400 Update details for parole development release 0.5.90 on the way to 0.6.0 stable release ChangeLog |4 ++-- README |2 +- configure.ac.in |8 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d201681..e44e761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -2013-10-11: bluesa...@xfce.org -* Road to 0.6.0... +2013-10-19: bluesa...@xfce.org +* Development release 0.5.90 * Completed port to GTK+3 - Remove deprecated GTK+2 items - Use GtkOverlay for player controls diff --git a/README b/README index 4f72d97..63e6790 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ Required packages = Parole depends on the following packages: - - Gtk 3.0 or above. + - Gtk 3.2 or above. - Glib 2.32 or above. - Gio 2.28 or above. - DBus 0.60 or above. diff --git a/configure.ac.in b/configure.ac.in index 0e8ef00..3386947 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:6:0]) +m4_define([parole_verinfo], [0:5:90]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) -m4_define([parole_version_minor], [6]) -m4_define([parole_version_micro], [0]) +m4_define([parole_version_minor], [5]) +m4_define([parole_version_micro], [90]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) @@ -78,7 +78,7 @@ XDT_I18N([@LINGUAS@]) # = # # Check for required packages # # = # -m4_define([gtk_minimum_version], [3.0.0]) +m4_define([gtk_minimum_version], [3.2.0]) m4_define([glib_minimum_version], [2.32.0]) dnl gstreamer version ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix strings (bug #10405)
Updating branch refs/heads/master
to eb43c2e9db2bb62595e2f634c07a63ccb9c24a48 (commit)
from b5c77983078455667fe6d25037f629a4807deb82 (commit)
commit eb43c2e9db2bb62595e2f634c07a63ccb9c24a48
Author: Sean Davis
Date: Sun Oct 13 07:03:20 2013 -0400
Fix strings (bug #10405)
data/interfaces/parole.ui |2 +-
src/parole-medialist.c|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 614299e..c13c361 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -637,7 +637,7 @@
-_Preferences
+_Preferences
True
False
True
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index c5a2a1a..ad87c34 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -679,7 +679,7 @@ parole_media_list_save_playlist_response_cb
(GtkDialog *dialog,
{
parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel
(data->list->priv->view)),
_("Unknown playlist format"),
-_("Please chooser a supported playlist
format"));
+_("Please choose a supported playlist
format"));
goto out;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updated changelog
Updating branch refs/heads/master to ba494a17c6a227d1d02f1b1290eacb95fe4e8969 (commit) from b30fa93f0ec1d1338954314bd63fa9963dde0c4b (commit) commit ba494a17c6a227d1d02f1b1290eacb95fe4e8969 Author: Sean Davis Date: Sat Oct 12 05:58:02 2013 -0400 Updated changelog ChangeLog |1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b13f482..d201681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ - missing option to open DVD from iso (bug #10300) - Allow a playlist to be sorted and/or items to be moved (bug #10066) - Remember playlist option in GUI not working (bug #10269) + - Parole show irritating edge (bug #10081) 2013-08-03: bluesa...@xfce.org * Bugfix release 0.5.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Change gst timeout to 250ms from 1000ms for better update of timer
Updating branch refs/heads/master
to 0abb84efc45f142e15dd5f99cdcf7c81438cc58f (commit)
from a03409ba80661e2d513f21e94f00f22adcfe6d04 (commit)
commit 0abb84efc45f142e15dd5f99cdcf7c81438cc58f
Author: Sean Davis
Date: Sat Sep 14 07:07:04 2013 -0400
Change gst timeout to 250ms from 1000ms for better update of timer
src/gst/parole-gst.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index c6bca2b..b72cf42 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -585,7 +585,7 @@ parole_gst_tick (ParoleGst *gst)
{
return;
}
-gst->priv->tick_id = g_timeout_add (1000, (GSourceFunc)
parole_gst_tick_timeout, gst);
+gst->priv->tick_id = g_timeout_add (250, (GSourceFunc)
parole_gst_tick_timeout, gst);
}
else if ( gst->priv->tick_id != 0)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove broken seekf/seekb from dbus/cli commands. Improve mute dbus/cli command. Add unmute dbus/cli command
Updating branch refs/heads/master
to 4f8e3ca6f9b55823e3fcca8f8241b87de4694c21 (commit)
from 38ac3e19be4efa57157e15f588bf10665a0a7704 (commit)
commit 4f8e3ca6f9b55823e3fcca8f8241b87de4694c21
Author: Sean Davis
Date: Sun Sep 22 07:57:18 2013 -0400
Remove broken seekf/seekb from dbus/cli commands. Improve mute dbus/cli
command. Add unmute dbus/cli command
src/main.c | 18 ++-
src/org.parole.media.player.xml |9 +++-
src/parole-player.c | 46 +++
3 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6917c80..b2abf32 100644
--- a/src/main.c
+++ b/src/main.c
@@ -260,11 +260,10 @@ int main (int argc, char **argv)
gboolean stop = FALSE;
gboolean next_track = FALSE;
gboolean prev_track = FALSE;
-gboolean seek_f = FALSE;
-gboolean seek_b = FALSE;
gboolean raise_volume = FALSE;
gboolean lower_volume = FALSE;
gboolean mute = FALSE;
+gboolean unmute = FALSE;
gboolean no_plugins = FALSE;
gboolean embedded = FALSE;
gboolean fullscreen = FALSE;
@@ -281,11 +280,10 @@ int main (int argc, char **argv)
{ "stop", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &stop, N_("Stop
playing"), NULL },
{ "next-track", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
&next_track, N_("Next track"), NULL },
{ "previous-track", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
&prev_track, N_("Previous track"), NULL },
-{ "seek-f", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &seek_f,
N_("Seek forward"), NULL },
-{ "seek-b", 'b', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &seek_b,
N_("Seek Backward"), NULL },
{ "raise-volume", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
&raise_volume, N_("Raise volume"), NULL },
{ "lower-volume", 'l', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
&lower_volume, N_("Lower volume"), NULL },
{ "mute", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &mute, N_("Mute
volume"), NULL },
+{ "unmute", 'u', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &unmute,
N_("Unmute (restore) volume"), NULL },
{ "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version,
N_("Print version information and exit"), NULL },
{ "embedded", 'E', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &embedded,
N_("Start in embedded mode"), NULL },
{ "fullscreen", 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
&fullscreen, N_("Start in fullscreen mode"), NULL },
@@ -340,7 +338,8 @@ int main (int argc, char **argv)
/* Check for cli options if there is an instance of Parole already */
if ( !new_instance && parole_dbus_name_has_owner (PAROLE_DBUS_NAME) )
{
-if (!enqueue)
+if (!enqueue && !play && !stop && !next_track && !prev_track &&
+!raise_volume && !lower_volume && !mute && !unmute)
g_print (_("Parole is already running, use -i to open a new
instance\n"));
if ( filenames && filenames[0] != NULL )
@@ -360,12 +359,6 @@ int main (int argc, char **argv)
if ( prev_track )
parole_send_message ("PrevTrack");
-if ( seek_f )
-parole_send_message ("SeekForward");
-
-if ( seek_b )
-parole_send_message ("SeekBackward");
-
if ( raise_volume )
parole_send_message ("RaiseVolume");
@@ -374,6 +367,9 @@ int main (int argc, char **argv)
if ( mute )
parole_send_message ("Mute");
+
+if ( unmute )
+parole_send_message ("Unmute");
}
/* Create a new instance because Parole isn't running */
diff --git a/src/org.parole.media.player.xml b/src/org.parole.media.player.xml
index 5be1362..d53987f 100644
--- a/src/org.parole.media.player.xml
+++ b/src/org.parole.media.player.xml
@@ -19,12 +19,6 @@
-
-
-
-
-
-
@@ -34,6 +28,9 @@
+
+
+
diff --git a/src/parole-player.c b/src/parole-player.c
index d43ef04..cabf6f9 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -397,6 +397,7 @@ struct ParolePlayerPrivate
GtkWidget *audiobox_artist;
GtkWidget *volume;
+GtkWidget *mute;
GtkWidget
[Xfce4-commits] Cleanup styles
Updating branch refs/heads/master
to 52bc073e30f29b32fea574257ad61b6626638567 (commit)
from ecdfdc33de4d432af56d71705f87ad836fb8abab (commit)
commit 52bc073e30f29b32fea574257ad61b6626638567
Author: Sean Davis
Date: Mon Oct 7 06:08:59 2013 -0400
Cleanup styles
src/gst/parole-gst.c |6 --
src/parole-player.c | 13 +
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 922f23e..878deff 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2714,8 +2714,10 @@ parole_gst_set_cursor_visible (ParoleGst *gst, gboolean
visible)
{
if ( visible )
{
-gst->priv->target == gst->priv->state ? gdk_window_set_cursor
(gtk_widget_get_window(GTK_WIDGET (gst)), NULL):
-parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst)));
+if (gst->priv->target == gst->priv->state)
+gdk_window_set_cursor (gtk_widget_get_window(GTK_WIDGET (gst)),
NULL);
+else
+parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET
(gst)));
}
else
parole_window_invisible_cursor (gtk_widget_get_window(GTK_WIDGET
(gst)));
diff --git a/src/parole-player.c b/src/parole-player.c
index ffe5c2e..643cfb4 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1951,7 +1951,6 @@ void
parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
{
static gint current_page = 0;
-GdkWindow *gdkwindow;
gboolean show_playlist;
@@ -1972,7 +1971,6 @@ parole_player_reset_controls (ParolePlayer *player,
gboolean fullscreen)
gtk_window_unfullscreen (GTK_WINDOW (player->priv->window));
gtk_notebook_set_current_page (GTK_NOTEBOOK
(player->priv->playlist_nt), current_page);
-gdkwindow = gtk_widget_get_window (player->priv->gst);
parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst),
FALSE);
player->priv->full_screen = FALSE;
}
@@ -2139,16 +2137,15 @@ gboolean parole_player_hide_controls (gpointer data)
GdkWindow *gdkwindow;
GtkWidget *controls;
+TRACE("start");
+
player = PAROLE_PLAYER (data);
controls = gtk_widget_get_parent(player->priv->control);
-if ( gtk_widget_get_visible (controls) )
-{
-gtk_widget_hide(controls);
-gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->gst));
-parole_window_invisible_cursor (gdkwindow);
-}
+gtk_widget_hide(controls);
+gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->gst));
+parole_window_invisible_cursor (gdkwindow);
return FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Move motion-notify-event to glade
Updating branch refs/heads/master
to bd77a00f98c72b9506a471e22dcda5b7ab70a1b1 (commit)
from 9183a35bf0a349c3f68aef3da3cbfa4572db4395 (commit)
commit bd77a00f98c72b9506a471e22dcda5b7ab70a1b1
Author: Sean Davis
Date: Sun Sep 15 23:05:48 2013 -0400
Move motion-notify-event to glade
data/interfaces/parole.ui |1 +
src/parole-player.c | 12 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index b2199be..ee9cc58 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -719,6 +719,7 @@
False
+
True
diff --git a/src/parole-player.c b/src/parole-player.c
index fba09b6..befbde6 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -253,6 +253,11 @@ gbooleanparole_player_gst_widget_button_press
(GtkWidget *widget,
gbooleanparole_player_gst_widget_button_release (GtkWidget *widget,
GdkEventButton *ev,
ParolePlayer *player);
+
+gboolean
+parole_player_gst_widget_motion_notify_event(GtkWidget *widget,
+ GdkEventMotion *ev,
+ ParolePlayer *player);
voidparole_show_about (GtkWidget *widget,
ParolePlayer *player);
@@ -2078,7 +2083,7 @@ gboolean parole_player_hide_fs_window (gpointer data)
return FALSE;
}
-static gboolean
+gboolean
parole_player_gst_widget_motion_notify_event (GtkWidget *widget,
GdkEventMotion *ev, ParolePlayer *player)
{
static gulong hide_timeout = 0;
@@ -2918,9 +2923,6 @@ parole_player_init (ParolePlayer *player)
g_signal_connect (G_OBJECT (player->priv->gst), "dvd-chapter-change",
G_CALLBACK (parole_player_dvd_chapter_change_cb), player);
-g_signal_connect (G_OBJECT (player->priv->gst), "motion-notify-event",
-G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
-
g_signal_connect (G_OBJECT (player->priv->gst), "notify::volume",
G_CALLBACK (parole_property_notify_cb_volume), player);
@@ -3109,8 +3111,6 @@ parole_player_init (ParolePlayer *player)
gdk_color_parse("black", &background);
gtk_widget_modify_bg(GTK_WIDGET(player->priv->eventbox_output),
GTK_STATE_NORMAL, &background);
gtk_widget_add_events (GTK_WIDGET (player->priv->eventbox_output),
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
-g_signal_connect (G_OBJECT (player->priv->eventbox_output),
"motion-notify-event",
-G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
/* Background Image */
logo = gdk_pixbuf_new_from_file (g_strdup_printf ("%s/parole.png",
PIXMAPS_DIR), NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove playlist if empty on close, make hide_menubar static
Updating branch refs/heads/master
to 38ac3e19be4efa57157e15f588bf10665a0a7704 (commit)
from ea95a43cd4edb449cdd662a67ae252f99be44aaa (commit)
commit 38ac3e19be4efa57157e15f588bf10665a0a7704
Author: Sean Davis
Date: Sun Sep 22 07:05:51 2013 -0400
Remove playlist if empty on close, make hide_menubar static
src/parole-medialist.c |1 +
src/parole-player.c|2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 73ac2a6..814a54d 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -2087,6 +2087,7 @@ void parole_media_list_save_list (ParoleMediaList *list)
{
// If the playlist is empty, delete the list.
remove(history);
+g_free(history);
}
g_slist_free (fileslist);
}
diff --git a/src/parole-player.c b/src/parole-player.c
index a7b5be9..d43ef04 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2003,7 +2003,7 @@ void parole_player_fullscreen_action_cb (GtkAction
*action, ParolePlayer *player
parole_player_full_screen (player, !player->priv->full_screen);
}
-void parole_player_hide_menubar_cb (GtkWidget *widget, ParolePlayer *player)
+static void parole_player_hide_menubar_cb (GtkWidget *widget, ParolePlayer
*player)
{
gtk_widget_set_visible(player->priv->menu_bar,
!gtk_widget_get_visible(player->priv->menu_bar));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set minimum width to accomodate controls, adjust minimum height to accomodate coverart
Updating branch refs/heads/master
to 3988db6ec1d2182321707b55a9d265c19ecc82bf (commit)
from 9a8bb2e1f24084e0fb2b039cf90abcd9bd5658dd (commit)
commit 3988db6ec1d2182321707b55a9d265c19ecc82bf
Author: Sean Davis
Date: Fri Oct 4 21:40:32 2013 -0400
Set minimum width to accomodate controls, adjust minimum height to
accomodate coverart
data/interfaces/parole.ui | 24
src/parole-player.c | 30 --
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index f78c67f..007d497 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -6,11 +6,11 @@
1
10
-
+
True
False
16
-gtk-about-symbolic
+face-sick-symbolic
True
@@ -20,13 +20,6 @@
media-optical-symbolic
True
-
-True
-False
-16
-face-sick-symbolic
-True
-
True
False
@@ -55,6 +48,13 @@
media-skip-backward-symbolic
True
+
+True
+False
+16
+gtk-about-symbolic
+True
+
True
False
@@ -422,8 +422,8 @@
True
image_volume_up
False
-
+
@@ -718,8 +718,8 @@
-128
-128
+380
+256
True
False
diff --git a/src/parole-player.c b/src/parole-player.c
index 506dd06..26da795 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2702,37 +2702,31 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t
*cr, gpointer user_data)
return FALSE;
}
+/* This function allows smoothly adjusting the window alignment with coverart
*/
static gboolean
parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer
*player)
{
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
gboolean homogeneous;
+
+/* Float the cover and text together in the middle if there is space */
gtk_widget_get_allocation(w, allocation);
homogeneous = allocation->width > 536;
g_free(allocation);
+/* Nothing to do if the homogeneous setting is already good */
if ( gtk_box_get_homogeneous( GTK_BOX(w) ) == homogeneous )
return FALSE;
gtk_box_set_homogeneous( GTK_BOX(w), homogeneous );
-if (homogeneous)
-{
-gtk_box_set_child_packing (GTK_BOX(w),
- player->priv->audiobox_cover,
- TRUE,
- TRUE,
- 0,
- GTK_PACK_START);
-}
-else
-{
-gtk_box_set_child_packing (GTK_BOX(w),
- player->priv->audiobox_cover,
- FALSE,
- TRUE,
- 0,
- GTK_PACK_START);
-}
+
+/* Expand the coverart if the parent box packing is homogenous */
+gtk_box_set_child_packing (GTK_BOX(w),
+ player->priv->audiobox_cover,
+ homogeneous,
+ TRUE,
+ 0,
+ GTK_PACK_START);
return FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix tooltips, fix controls disappearing while being used
Updating branch refs/heads/master
to 802f64f142e1198cb10c3f52149d6e3e559376d0 (commit)
from de76a6bd55c0bb5f0a38723b9aa364dd039ccd18 (commit)
commit 802f64f142e1198cb10c3f52149d6e3e559376d0
Author: Sean Davis
Date: Sun Oct 6 12:08:16 2013 -0400
Fix tooltips, fix controls disappearing while being used
src/parole-player.c | 45 -
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 1d87dd9..f73d2fa 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -381,6 +381,7 @@ struct ParolePlayerPrivate
GtkWidget *progressbar_buffering;
GtkWidget *volume;
GtkWidget *mute;
+GtkWidget *showhide_playlist_button;
/* Infobar */
GtkWidget *infobar;
@@ -516,6 +517,7 @@ void parole_player_set_playlist_visible (ParolePlayer
*player, gboolean visibili
gtk_widget_show (player->priv->playlist_nt);
gtk_action_set_tooltip( GTK_ACTION(
player->priv->toggle_playlist_action ), _("Hide playlist") );
+gtk_widget_set_tooltip_text
(GTK_WIDGET(player->priv->showhide_playlist_button), _("Hide playlist") );
g_object_set (G_OBJECT (player->priv->conf),
"showhide-playlist", TRUE,
NULL);
@@ -524,6 +526,7 @@ void parole_player_set_playlist_visible (ParolePlayer
*player, gboolean visibili
{
gtk_widget_hide (player->priv->playlist_nt);
gtk_action_set_tooltip( GTK_ACTION(
player->priv->toggle_playlist_action ), _("Show playlist") );
+gtk_widget_set_tooltip_text
(GTK_WIDGET(player->priv->showhide_playlist_button), _("Show playlist") );
g_object_set (G_OBJECT (player->priv->conf),
"showhide-playlist", FALSE,
NULL);
@@ -1283,21 +1286,23 @@ parole_player_seekable_notify (ParoleStream *stream,
GParamSpec *spec, ParolePla
static void
parole_player_set_playpause_button_from_stock (ParolePlayer *player, const
gchar *stock_id)
{
-gchar *icon_name = NULL, *label = NULL;
+gchar *icon_name = NULL, *label = NULL, *tooltip = NULL;
if (g_strcmp0(stock_id, "gtk-media-play") == 0) {
icon_name = g_strdup("media-playback-start-symbolic");
label = _("_Play");
+tooltip = _("Play");
} else if (g_strcmp0(stock_id, "gtk-media-pause") == 0) {
icon_name = g_strdup("media-playback-pause-symbolic");
label = _("_Pause");
+tooltip = _("Pause");
}
gtk_action_set_icon_name(player->priv->media_playpause_action, icon_name);
gtk_action_set_label(player->priv->media_playpause_action, label);
-gtk_action_set_tooltip(player->priv->media_playpause_action, label);
+gtk_action_set_tooltip(player->priv->media_playpause_action, tooltip);
gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->playpause_image),
icon_name, 24);
-gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->playpause_button),
label);
+gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->playpause_button),
tooltip);
}
static void
@@ -2909,6 +2914,8 @@ parole_player_init (ParolePlayer *player)
GtkWidget *controls_parent;
GtkWidget *play_box;
+GList *widgets;
+
GtkWidget *action_widget;
g_setenv("PULSE_PROP_media.role", "video", TRUE);
@@ -3168,14 +3175,15 @@ parole_player_init (ParolePlayer *player)
/* FIXME: UGLY CODE IN THE NEXT BLOCK */
/* Media Controls */
controls_overlay = GTK_WIDGET(gtk_overlay_new());
-/* control is a placeholder to put the play_box as it is moved to/from the
fs-window */
+
player->priv->control = GTK_WIDGET (gtk_builder_get_object (builder,
"control"));
+
play_box = GTK_WIDGET (gtk_builder_get_object (builder, "media_controls"));
-
controls_parent = GTK_WIDGET(gtk_builder_get_object (builder, "box2"));
gtk_box_pack_start (GTK_BOX(controls_parent), controls_overlay, TRUE,
TRUE, 0);
gtk_widget_reparent(GTK_WIDGET(player->priv->eventbox_output),
controls_overlay);
-tmp_box = GTK_WIDGET(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+tmp_box = GTK_WIDGET(gtk_event_box_new());
+
gtk_widget_set_vexpand(GTK_WIDGET(tmp_box), FALSE);
gtk_widget_set_hexpand(GTK_WIDGET(tmp_box), FALSE);
gtk_widget_set_margin_left(tmp_box, 10);
@@ -3195,8 +3203,23 @@ parole_player_init (ParolePlayer *player)
gtk_container_set_border_width(GTK_CONTAINER(play_box), 3);
gtk_widget_show_all(controls_parent);
+/* Enable moti
[Xfce4-commits] Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3
Updating branch refs/heads/master
to ea95a43cd4edb449cdd662a67ae252f99be44aaa (commit)
from f6c28682248152abf58a88f7a5c269285c7ae7e4 (commit)
commit ea95a43cd4edb449cdd662a67ae252f99be44aaa
Merge: f6c2868 8cb12d4
Author: Sean Davis
Date: Sun Sep 22 06:55:14 2013 -0400
Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into
bluesabre/gtk3
commit 8cb12d45f65f64ee68991b23907114e9d9372db7
Author: Simon Steinbeiss
Date: Sat Sep 21 09:57:12 2013 +0200
Remove/clear auto-saved-playlist file upon using the clear-playlist button
commit 071acfe9893612c7a498029993e311fa358b61c5
Author: Simon Steinbeiss
Date: Sat Sep 21 01:54:54 2013 +0200
Add a dummy-test to see whether plugin-loading fails
commit 01bf90e358e4580553d6a0d6cd03cc825c291e60
Author: Simon Steinbeiss
Date: Wed Sep 18 12:18:42 2013 +0200
Add a menu accelerator to make the keyboard-shortcut more discoverable
commit 497cd7e12e737e214b8acbffe601589949d73ee1
Author: Simon Steinbeiss
Date: Wed Sep 18 10:25:50 2013 +0200
Add keyboard-shortcut (Control+m) to hide menubar
commit d7594d0c7bd9cf706e36b8beb9055ded57e020a0
Author: Simon Steinbeiss
Date: Mon Sep 16 22:24:28 2013 +0200
Add option to hide the menubar to the context-menu
src/parole-medialist.c |8
src/parole-player.c | 27 ++-
src/parole-plugins-manager.c | 10 --
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index bd7a512..73ac2a6 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -572,7 +572,15 @@ parole_media_list_add_clicked_cb (GtkButton *button,
ParoleMediaList *list)
void
parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
{
+gchar *playlist_filename;
+GFile *playlist_file;
parole_media_list_clear_list (list);
+playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+
PAROLE_AUTO_SAVED_PLAYLIST,
+ FALSE);
+playlist_file = g_file_new_for_path(playlist_filename);
+g_file_delete(playlist_file, NULL, NULL);
+g_free(playlist_filename);
}
/**
diff --git a/src/parole-player.c b/src/parole-player.c
index d6f70bc..a7b5be9 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -153,7 +153,7 @@ voidparole_player_toggle_playlist_action_cb
(GtkAction *action,
voidparole_player_fullscreen_action_cb (GtkAction *action,
ParolePlayer *player);
-
+
voidparole_player_seekf_cb (GtkWidget *widget,
ParolePlayer *player,
gdouble seek);
@@ -2003,10 +2003,18 @@ void parole_player_fullscreen_action_cb (GtkAction
*action, ParolePlayer *player
parole_player_full_screen (player, !player->priv->full_screen);
}
+void parole_player_hide_menubar_cb (GtkWidget *widget, ParolePlayer *player)
+{
+gtk_widget_set_visible(player->priv->menu_bar,
!gtk_widget_get_visible(player->priv->menu_bar));
+}
+
static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
GtkWidget *menu, *mi;
+GtkAccelGroup *accels = gtk_accel_group_new();
+
+gtk_window_add_accel_group(GTK_WINDOW(player->priv->window), accels);
player->priv->current_media_type = parole_gst_get_current_stream_type
(PAROLE_GST (player->priv->gst));
@@ -2035,6 +2043,18 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
mi = gtk_action_create_menu_item(player->priv->media_fullscreen_action);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+/*
+ * Un/Hide menubar
+ */
+mi =
gtk_check_menu_item_new_with_label(gtk_widget_get_visible(player->priv->menu_bar)
? _("Hide menubar") : _("Show menubar"));
+g_signal_connect (mi, "activate",
+G_CALLBACK (parole_player_hide_menubar_cb), player);
+gtk_widget_add_accelerator(mi, "activate", accels,
+ GDK_KEY_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+gtk_widget_show (mi);
+gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+
g_signal_connect_swapped (menu, "selection-done",
G_CALLBACK (gtk_widget_destroy), menu);
@@ -2472,6 +2492,11 @@ parole_player_handle_key_press (GdkEventKey *ev,
ParolePlayer *player)
case GDK_KEY_Escape:
parole_player_full_screen (player, FALSE);
break;
+case GDK_KEY_m:
+if (ev->state & GDK_CONTROL_
[Xfce4-commits] Remove redundant playlist title code
Updating branch refs/heads/master
to bde5e5b8f297e66b0ee5026f0a6b70574fa521ad (commit)
from 98b00eedc3a7418b241d6f839f9bf0bfd2dbca12 (commit)
commit bde5e5b8f297e66b0ee5026f0a6b70574fa521ad
Author: Sean Davis
Date: Sun Sep 15 22:07:50 2013 -0400
Remove redundant playlist title code
src/gst/parole-gst.c |3 ++
src/parole-medialist.c | 82
2 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 452621e..acb93c5 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -466,7 +466,10 @@ static void
parole_gst_set_video_overlay (ParoleGst *gst)
{
GstElement *video_sink;
+#if GTK_CHECK_VERSION(3,8,0)
+#else
gboolean enable_xv;
+#endif
g_object_get (G_OBJECT (gst->priv->playbin),
"video-sink", &video_sink,
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 28ca38b..afd783b 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -211,6 +211,44 @@ parole_media_list_set_widget_sensitive (ParoleMediaList
*list, gboolean sensitiv
gtk_widget_set_sensitive (GTK_WIDGET (list->priv->clear_button),
sensitive);
}
+static void
+parole_media_list_set_playlist_count (ParoleMediaList *list, gint n_items)
+{
+/* Toggle sensitivity based on playlist count */
+parole_media_list_set_widget_sensitive (list, n_items != 0);
+gtk_widget_set_sensitive (list->priv->remove_button, n_items != 0);
+gtk_widget_set_sensitive (list->priv->clear_button, n_items != 0);
+
+if ( n_items == 1 )
+{
+if
(gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) ==
0)
+{
+gtk_tree_view_column_set_title (list->priv->col,
g_strdup_printf(_("Playlist (%i item)"), n_items));
+}
+else
+{
+gtk_tree_view_column_set_title (list->priv->disc_col,
g_strdup_printf(_("Playlist (%i chapter)"), n_items));
+}
+}
+else
+{
+if
(gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) ==
0)
+{
+gtk_tree_view_column_set_title (list->priv->col,
g_strdup_printf(_("Playlist (%i items)"), n_items));
+}
+else
+{
+gtk_tree_view_column_set_title (list->priv->disc_col,
g_strdup_printf(_("Playlist (%i chapters)"), n_items));
+}
+}
+
+/*
+ * Will emit the signal media_cursor_changed with FALSE because there is
no any
+ * row remaining, so the player can disable click on the play button.
+ */
+g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0, n_items
!= 0);
+}
+
/**
* parole_media_list_add:
* @ParoleMediaList: a #ParoleMediaList
@@ -270,31 +308,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
else
nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL
(list->priv->store), NULL);
-if ( nch == 1 )
-{
-gtk_widget_set_sensitive (list->priv->remove_button, TRUE);
-gtk_widget_set_sensitive (list->priv->clear_button, TRUE);
-if
(gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) ==
0)
-{
-gtk_tree_view_column_set_title (list->priv->col,
g_strdup_printf(_("Playlist (%i item)"), nch));
-}
-else
-{
-gtk_tree_view_column_set_title (list->priv->disc_col,
g_strdup_printf(_("Playlist (%i chapter)"), nch));
-}
-}
-else
-{
-parole_media_list_set_widget_sensitive (list, TRUE);
-if
(gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) ==
0)
-{
-gtk_tree_view_column_set_title (list->priv->col,
g_strdup_printf(_("Playlist (%i items)"), nch));
-}
-else
-{
-gtk_tree_view_column_set_title (list->priv->disc_col,
g_strdup_printf(_("Playlist (%i chapters)"), nch));
-}
-}
+parole_media_list_set_playlist_count(list, nch);
}
/**
@@ -977,20 +991,7 @@ parole_media_list_remove_clicked_cb (GtkButton *button,
ParoleMediaList *list)
*/
nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store),
NULL);
-if ( nch == 0)
-{
-parole_media_list_set_widget_sensitive (list, FALSE);
-gtk_tree_view_column_set_title (list->priv->col,
g_strdup_printf(_("Playlist (%i items)"), nch));
-/*
- * Will emit the signal media_cursor_changed with FALSE because there
is no any
- * row remaining, so the player can disable click on the play button.
- */
-g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSO
[Xfce4-commits] Fix fullscreen controls/mouse visibility
Updating branch refs/heads/master to 319707d65b26d960916a68226b28f351035724a9 (commit) from a2e7c914795687bab7a2510013b579bbde9f5f90 (commit) commit 319707d65b26d960916a68226b28f351035724a9 Author: Sean Davis Date: Mon Oct 7 06:16:09 2013 -0400 Fix fullscreen controls/mouse visibility src/parole-player.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index 643cfb4..5bb2c8e 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2144,7 +2144,7 @@ gboolean parole_player_hide_controls (gpointer data) controls = gtk_widget_get_parent(player->priv->control); gtk_widget_hide(controls); -gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->gst)); +gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->eventbox_output)); parole_window_invisible_cursor (gdkwindow); return FALSE; @@ -2164,7 +2164,7 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion gtk_widget_show_all (gtk_widget_get_parent(player->priv->control)); -gdkwindow = gtk_widget_get_window (player->priv->window); +gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->eventbox_output)); gdk_window_set_cursor (gdkwindow, NULL); if ( player->priv->state == PAROLE_STATE_PLAYING ) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make fallback image 256 to match artwork
Updating branch refs/heads/master
to 9a8bb2e1f24084e0fb2b039cf90abcd9bd5658dd (commit)
from fd367c2058d1c6549d2def25c245c6ec7cc5bce5 (commit)
commit 9a8bb2e1f24084e0fb2b039cf90abcd9bd5658dd
Author: Sean Davis
Date: Thu Oct 3 22:24:00 2013 -0400
Make fallback image 256 to match artwork
data/interfaces/parole.ui |4 +++-
src/parole-player.c |2 --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index ad5240b..f78c67f 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -752,10 +752,12 @@
True
+256
+256
True
False
1
-128
+256
audio-x-generic-symbolic
True
diff --git a/src/parole-player.c b/src/parole-player.c
index bf6134c..506dd06 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2717,7 +2717,6 @@ parole_audiobox_expose_event (GtkWidget *w,
GdkEventExpose *ev, ParolePlayer *pl
gtk_box_set_homogeneous( GTK_BOX(w), homogeneous );
if (homogeneous)
{
-g_object_set( player->priv->audiobox_cover, "xalign", 1.0, NULL);
gtk_box_set_child_packing (GTK_BOX(w),
player->priv->audiobox_cover,
TRUE,
@@ -2727,7 +2726,6 @@ parole_audiobox_expose_event (GtkWidget *w,
GdkEventExpose *ev, ParolePlayer *pl
}
else
{
-g_object_set( player->priv->audiobox_cover, "xalign", 0.0, NULL);
gtk_box_set_child_packing (GTK_BOX(w),
player->priv->audiobox_cover,
FALSE,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Cleanup, rearrange code
Updating branch refs/heads/master
to e543e3a646ae4b7832a75c00d02fd569a7b57537 (commit)
from c0652d293c4afc4f98a9ba97bcc9e17ea7af6ef6 (commit)
commit e543e3a646ae4b7832a75c00d02fd569a7b57537
Author: Sean Davis
Date: Sun Sep 22 23:44:32 2013 -0400
Cleanup, rearrange code
src/parole-player.c | 125 +--
1 file changed, 60 insertions(+), 65 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 993a506..fb0aeaa 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -314,7 +314,7 @@ gbooleanparole_player_key_press
(GtkWidget *widget,
GdkEventKey *ev,
ParolePlayer *player);
-gboolean parole_player_hide_fs_window (gpointer data);
+gboolean parole_player_hide_controls (gpointer data);
static GtkTargetEntry target_entry[] =
{
@@ -334,91 +334,94 @@ struct ParolePlayerPrivate
ParoleMediaList*list;
ParoleDisc *disc;
ParoleScreenSaver *screen_saver;
+
ParoleConf *conf;
-#ifdef HAVE_XF86_KEYSYM
-ParoleButton *button;
-#endif
-
ParoleConfDialog *settings_dialog;
XfceSMClient *sm_client;
gchar *client_id;
+#ifdef HAVE_XF86_KEYSYM
+ParoleButton *button;
+#endif
+
GtkFileFilter *video_filter;
GtkRecentManager *recent;
-GtkWidget *gst;
-ParoleMediaType current_media_type;
-
GtkWidget *window;
-GtkWidget *recent_menu;
GtkWidget *playlist_nt;
-GtkWidget *range;
-
-GtkWidget *progressbar_buffering;
+/* Parole Player layouts */
+gbooleanembedded;
+gbooleanfull_screen;
+/* Remembered window sizes */
+gintlast_h, last_w;
+/* HPaned handle-width for calculating size with playlist */
+ginthandle_width;
-GtkWidget *label_elapsed;
-GtkWidget *label_duration;
+/* Menubar */
+GtkWidget *menu_bar;
+GtkWidget *recent_menu;
+GtkWidget *save_playlist;
+GtkWidget *dvd_menu;
+GtkWidget *chapters_menu;
-GtkWidget *control; /* contains all play button*/
+/* Media Controls */
+GtkWidget *control;
GtkWidget *playpause_button;
GtkWidget *playpause_image;
GtkWidget *fullscreen_button;
GtkWidget *fullscreen_image;
-GtkWidget *logo_image;
+GtkWidget *label_elapsed;
+GtkWidget *label_duration;
+GtkWidget *range;
+GtkWidget *progressbar_buffering;
+GtkWidget *volume;
+GtkWidget *mute;
-GtkWidget *hbox_infobar;
+/* Infobar */
GtkWidget *infobar;
+/* Audio Track */
GtkWidget *combobox_audiotrack;
-GtkWidget *combobox_subtitles;
GtkListStore *liststore_audiotrack;
-GtkListStore *liststore_subtitles;
GList *audio_list;
-GList *subtitle_list;
gbooleanupdate_languages;
+GtkWidget *audio_group;
+GtkWidget *languages_menu;
+/* Subtitle Track */
+GtkWidget *combobox_subtitles;
+GtkListStore *liststore_subtitles;
+GList *subtitle_list;
gbooleanupdated_subs;
GtkWidget *subtitles_group;
GtkWidget *subtitles_menu_custom;
-GtkWidget *audio_group;
-
-GtkWidget *dvd_menu;
-GtkWidget *chapters_menu;
-
GtkWidget *subtitles_menu;
-GtkWidget *languages_menu;
+/* Output Widgets */
GtkWidget *eventbox_output;
+/* Idle Logo */
+GtkWidget *logo_image;
+/* VideoBox (Gst Video Output) Widget */
GtkWidget *videobox;
-
+/* AudioBox (Artwork, Title, Track, Album) Widgets */
GtkWidget *audiobox;
GtkWidget *audiobox_cover;
GtkWidget *audiobox_title;
GtkWidget *audiobox_album;
GtkWidget *audiobox_artist;
+
+/* Current media-list row reference */
+GtkTreeRowReference *row;
-GtkWidget *volume;
-GtkWidget *mute;
-GtkWidget *menu_bar;
-GtkWidget *save_playlist;
-GtkWidget *play_box;
-
-gbooleanexit;
-
-gbooleanembedded;
-gbooleanfull_screen;
-gintlast_h, last_w;
-
+/* GStreamer */
+GtkWidget *gst;
+ParoleMediaType current_media_type;
ParoleState
[Xfce4-commits] Make previous/next sensitive only when n_items > 1
Updating branch refs/heads/master
to dea0a2e1675b778b69abffb397622c70938bdccc (commit)
from bde5e5b8f297e66b0ee5026f0a6b70574fa521ad (commit)
commit dea0a2e1675b778b69abffb397622c70938bdccc
Author: Sean Davis
Date: Sun Sep 15 22:23:22 2013 -0400
Make previous/next sensitive only when n_items > 1
src/parole-medialist.c | 13 +
src/parole-medialist.h |3 +++
src/parole-player.c|9 +
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index afd783b..f309d47 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -249,6 +249,19 @@ parole_media_list_set_playlist_count (ParoleMediaList
*list, gint n_items)
g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0, n_items
!= 0);
}
+gint
+parole_media_list_get_playlist_count (ParoleMediaList *list)
+{
+if
(gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) ==
0)
+{
+return
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
+}
+else
+{
+return
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->disc_store), NULL);
+}
+}
+
/**
* parole_media_list_add:
* @ParoleMediaList: a #ParoleMediaList
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index 7d7fa1b..649d4f6 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -108,6 +108,9 @@ parole_media_list_is_selected_row
(ParoleMediaList *list);
gbooleanparole_media_list_is_empty (ParoleMediaList *list);
+gint
+parole_media_list_get_playlist_count(ParoleMediaList *list);
+
GtkTreeRowReference
*parole_media_list_get_first_row(ParoleMediaList *list);
diff --git a/src/parole-player.c b/src/parole-player.c
index 1b9d572..1443671 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1219,6 +1219,11 @@ parole_player_media_cursor_changed_cb (ParoleMediaList
*list, gboolean media_sel
gtk_action_set_sensitive (player->priv->media_playpause_action,
media_selected || !parole_media_list_is_empty
(player->priv->list));
}
+
+gtk_action_set_sensitive (player->priv->media_previous_action,
+parole_media_list_get_playlist_count
(player->priv->list) > 1);
+gtk_action_set_sensitive (player->priv->media_next_action,
+parole_media_list_get_playlist_count
(player->priv->list) > 1);
}
static void
@@ -1352,10 +1357,6 @@ parole_player_playing (ParolePlayer *player, const
ParoleStream *stream)
gtk_action_set_sensitive (player->priv->media_playpause_action, TRUE);
-/* FIXME: Better detection for when previous/next should be enabled */
-gtk_action_set_sensitive (player->priv->media_previous_action, TRUE);
-gtk_action_set_sensitive (player->priv->media_next_action, TRUE);
-
parole_player_set_playpause_button_from_stock (player, "gtk-media-pause");
gtk_widget_set_sensitive (player->priv->range, seekable);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Coverity fixes
Updating branch refs/heads/master
to 3c5d4f71fe84a86b4c3dfd147027fe9e8e2551cb (commit)
from ce2d71b625142f5b161a711ad98368c6e089e764 (commit)
commit 3c5d4f71fe84a86b4c3dfd147027fe9e8e2551cb
Author: Sean Davis
Date: Thu Sep 12 20:52:44 2013 -0400
Coverity fixes
src/gst/parole-gst.c |4
src/misc/parole-pl-parser.c|4 ++--
src/parole-conf-dialog.c |4 +++-
src/parole-medialist.c | 14 ++---
src/parole-player.c|3 +--
src/parole-plugins-manager.c | 45
src/parole-subtitle-encoding.c | 33 +++--
7 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 975f1af..c6bca2b 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2812,10 +2812,6 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar
* type_name)
ret = g_list_prepend (ret, lc);
g_free (cd);
}
-else if (cd)
-{
-ret = g_list_prepend (ret, cd);
-}
else
{
ret = g_list_prepend (ret, g_strdup_printf
(_("Subtitle #%d"), num++));
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 618cfd1..5de12e2 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -326,7 +326,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
GFile *file;
gchar **lines;
gchar *contents;
-gchar *path, *pl_filename;
+gchar *path, *pl_filename = NULL;
GSList *list = NULL;
gsize size;
guint num_lines;
@@ -722,7 +722,7 @@ out:
gboolean parole_pl_parser_save_from_files (GSList *files, const gchar
*filename, ParolePlFormat format)
{
FILE *f;
-gboolean ret_val;
+gboolean ret_val = FALSE;
PAROLE_DEBUG_ENUM_FULL (format, PAROLE_ENUM_TYPE_PL_FORMAT, "Saving
playlist %s ", filename);
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 27bf5df..8dd1821 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -284,7 +284,7 @@ void saturation_value_changed_cb (GtkRange *range,
ParoleConfDialog *self)
void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget,
ParoleConfDialog *self)
{
-gchar *active;
+gchar *active = NULL;
GstElementFactory *f;
GtkTreeIter iter;
@@ -292,6 +292,8 @@ void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox
*widget, ParoleConfD
if (gtk_combo_box_get_active_iter (widget, &iter))
gtk_tree_model_get (model, &iter, 0, &active, -1);
+else
+return;
f = g_hash_table_lookup (self->priv->vis_plugins, active);
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 9b08729..523a3ab 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -596,7 +596,7 @@ parole_media_list_get_first_selected_row (ParoleMediaList
*list)
static ParoleFile *
parole_media_list_get_first_selected_file (ParoleMediaList *list)
{
-ParoleFile *file;
+ParoleFile *file = NULL;
GtkTreeRowReference *row;
GtkTreeIter iter;
@@ -889,7 +889,7 @@ parole_media_list_paths_to_row_list (GList *path_list,
GtkTreeModel *model)
path = g_list_nth_data (path_list, i);
row = gtk_tree_row_reference_new (model, path);
-path = gtk_tree_row_reference_get_path (row);
+
row_list = g_list_append (row_list, row);
}
@@ -1027,8 +1027,8 @@ parole_media_list_move_up_clicked_cb (GtkButton *button,
ParoleMediaList *list)
for (i=0; ipriv->store), ¤t, path);
-gtk_list_store_move_before(GTK_LIST_STORE(model),
¤t, &iter);
+if (gtk_tree_model_get_iter (GTK_TREE_MODEL
(list->priv->store), ¤t, path))
+gtk_list_store_move_before(GTK_LIST_STORE(model),
¤t, &iter);
}
}
}
@@ -1075,8 +1075,8 @@ parole_media_list_move_down_clicked_cb (GtkButton
*button, ParoleMediaList *list
for (i=0; ipriv->store),
¤t, path);
-gtk_list_store_move_after(GTK_LIST_STORE(model), ¤t,
&iter);
+if (gtk_tree_model_get_iter (GTK_TREE_MODEL
(list->priv->store), ¤t, path))
+gtk_list_store_move_after(GTK_LIST_STORE(model), ¤t,
&iter);
}
}
@@ -1936,7 +1936,7 @@ GtkTreeRowReference *row)
else
{
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL
(list->priv->disc_store), &iter, path) )
-gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter,
NAME_COL, &name, -1);
+gtk_tree_model_get (GTK_TREE_MODEL(list-&g
[Xfce4-commits] Fix errors when removing last item from playlist
Updating branch refs/heads/master
to 97a15428d98a01d00d1125a9f7a479fe4c94 (commit)
from 130d28415d83ad17b0ba2177bc924077ad0609b9 (commit)
commit 97a15428d98a01d00d1125a9f7a479fe4c94
Author: Sean Davis
Date: Sun Sep 22 22:33:52 2013 -0400
Fix errors when removing last item from playlist
src/parole-medialist.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 814a54d..cd2d6b0 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -996,8 +996,15 @@ parole_media_list_remove_clicked_cb (GtkButton *button,
ParoleMediaList *list)
g_list_foreach (row_list, (GFunc) gtk_tree_row_reference_free, NULL);
g_list_free (row_list);
+/*
+ * Returns the number of children that iter has.
+ * As a special case, if iter is NULL,
+ * then the number of toplevel nodes is returned. Gtk API doc.
+ */
+nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store),
NULL);
+
/* No row was selected, then select the first one*/
-if (!row_selected)
+if (!row_selected && nch != 0)
{
GtkTreePath *path;
path = parole_media_list_get_first_path (model);
@@ -1005,13 +1012,6 @@ parole_media_list_remove_clicked_cb (GtkButton *button,
ParoleMediaList *list)
gtk_tree_path_free (path);
}
-/*
- * Returns the number of children that iter has.
- * As a special case, if iter is NULL,
- * then the number of toplevel nodes is returned. Gtk API doc.
- */
-nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store),
NULL);
-
parole_media_list_set_playlist_count(list, nch);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3
Updating branch refs/heads/master to a2e7c914795687bab7a2510013b579bbde9f5f90 (commit) from 52bc073e30f29b32fea574257ad61b6626638567 (commit) commit a2e7c914795687bab7a2510013b579bbde9f5f90 Merge: 52bc073 498c4e3 Author: Sean Davis Date: Mon Oct 7 06:09:05 2013 -0400 Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3 commit 498c4e30332227259d1dc522ee040528043f9282 Author: Simon Steinbeiss Date: Mon Oct 7 11:54:31 2013 +0200 Drop unused var ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Get rid of parole_player_stop_clicked
Updating branch refs/heads/master
to de76a6bd55c0bb5f0a38723b9aa364dd039ccd18 (commit)
from 3988db6ec1d2182321707b55a9d265c19ecc82bf (commit)
commit de76a6bd55c0bb5f0a38723b9aa364dd039ccd18
Author: Sean Davis
Date: Fri Oct 4 22:00:58 2013 -0400
Get rid of parole_player_stop_clicked
src/parole-player.c | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 26da795..1d87dd9 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -143,7 +143,7 @@ voidparole_player_range_value_changed
(GtkRange *range,
voidparole_player_playpause_action_cb (GtkAction *action,
ParolePlayer *player);
-voidparole_player_stop_clicked (GtkButton *button,
+voidparole_player_pause_clicked (GtkButton *button,
ParolePlayer *player);
voidparole_player_next_action_cb(GtkAction *action,
@@ -1670,9 +1670,9 @@ parole_player_playpause_action_cb (GtkAction *action,
ParolePlayer *player)
}
void
-parole_player_stop_clicked (GtkButton *button, ParolePlayer *player)
+parole_player_pause_clicked (GtkButton *button, ParolePlayer *player)
{
-parole_gst_stop (PAROLE_GST (player->priv->gst));
+parole_gst_pause (PAROLE_GST (player->priv->gst));
}
void parole_player_next_action_cb (GtkAction *action, ParolePlayer *player)
@@ -2514,11 +2514,6 @@ parole_player_handle_key_press (GdkEventKey *ev,
ParolePlayer *player)
parole_player_seekf_cb (NULL, player, seek_long);
ret_val = TRUE;
break;
-case GDK_KEY_s:
-case GDK_KEY_S:
-parole_player_stop_clicked (NULL, player);
-ret_val = TRUE;
-break;
case GDK_KEY_Escape:
parole_player_full_screen (player, FALSE);
break;
@@ -2563,7 +2558,7 @@ parole_player_key_press (GtkWidget *widget, GdkEventKey
*ev, ParolePlayer *playe
parole_player_toggle_playpause(player);
return TRUE;
case XF86XK_AudioStop:
-parole_player_stop_clicked (NULL, player);
+parole_player_pause_clicked (NULL, player);
return TRUE;
case XF86XK_AudioRaiseVolume:
parole_player_volume_up (NULL, player);
@@ -2600,7 +2595,7 @@ parole_player_button_pressed_cb (ParoleButton *button,
ParoleButtonKey key, Paro
parole_player_toggle_playpause(player);
break;
case PAROLE_KEY_AUDIO_STOP:
-parole_player_stop_clicked (NULL, player);
+parole_player_pause_clicked (NULL, player);
break;
case PAROLE_KEY_AUDIO_PREV:
parole_player_play_prev (player);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update changelog
Updating branch refs/heads/master to 7c737fa4ed0c0ff21cb044dd6935dec8b50e98ed (commit) from 9b5f3d70a1ab846c2407f757a68b3fbe8c60d486 (commit) commit 7c737fa4ed0c0ff21cb044dd6935dec8b50e98ed Author: Sean Davis Date: Sat Sep 14 08:07:54 2013 -0400 Update changelog ChangeLog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd9adee..16ff3ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -2013-09-07: bluesa...@xfce.org +2013-09-14: bluesa...@xfce.org * Road to 0.6.0... -* Fix remembered playlist not being forgotten when setting disabled. +* Fix Remember Playlist setting (bug 10269) * Fix Gstreamer 1.0 support * Port to GTK+3 * Update artwork (icons, background) @@ -13,6 +13,7 @@ * Add Previous/Next actions to Notify plugin * Add ability to play DVD ISOs (from Open dialog) * Add DVD menu item, appears only when playing a DVD or DVD ISO +* Add maximized setting in xfconf, remember correct maximization and window size * Remove redundant playlist settings button, add move-up/down 2013-07-25: bluesa...@xfce.org ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove unused code from parole-medialist.c
Updating branch refs/heads/master
to c0652d293c4afc4f98a9ba97bcc9e17ea7af6ef6 (commit)
from 97a15428d98a01d00d1125a9f7a479fe4c94 (commit)
commit c0652d293c4afc4f98a9ba97bcc9e17ea7af6ef6
Author: Sean Davis
Date: Sun Sep 22 22:43:23 2013 -0400
Remove unused code from parole-medialist.c
src/parole-medialist.c | 56 +++-
1 file changed, 12 insertions(+), 44 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index cd2d6b0..c5a2a1a 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -142,20 +142,15 @@ void
parole_media_list_format_cursor_changed_cb (GtkTreeView *view,
ParolePlaylistSave *data);
-voidparole_media_list_save_playlist_cb (GtkButton *button,
-ParolePlaylistSave *data);
-
-gbooleanparole_media_list_query_tooltip(GtkWidget *widget,
-gint x,
-gint y,
-gboolean keyboard_mode,
-GtkTooltip *tooltip,
-ParoleMediaList *list);
-
-voidparole_media_list_menu_pos (GtkMenu *menu,
-gint *px, gint *py,
-gboolean *push_in,
-gpointer data);
+voidparole_media_list_save_playlist_cb (GtkButton *button,
+ ParolePlaylistSave *data);
+
+gbooleanparole_media_list_query_tooltip (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip,
+ ParoleMediaList *list);
/*
* End of GtkBuilder callbacks
@@ -168,13 +163,9 @@ struct ParoleMediaListPrivate
{
DBusGConnection *bus;
ParoleConf *conf;
-GtkWidget *view;
-GtkWidget *disc_view;
-GtkWidget *box;
-GtkListStore*store;
-GtkListStore*disc_store;
-GtkTreeSelection*sel;
-GtkTreeSelection*disc_sel;
+GtkWidget *view, *disc_view;
+GtkListStore*store, *disc_store;
+GtkTreeSelection*sel, *disc_sel;
GtkTreeViewColumn *col, *disc_col;
GtkWidget *playlist_controls;
@@ -1274,29 +1265,6 @@ remember_playlist_activated_cb (GtkWidget *mi,
ParoleConf *conf)
}
}
-void
-parole_media_list_menu_pos (GtkMenu *menu, gint *px, gint *py, gboolean
*push_in, gpointer data)
-{
-gint x, y;
-GtkAllocation widget_allocation, menu_allocation;
-GtkWidget *widget = gtk_menu_get_attach_widget( menu );
-GdkWindow *window;
-
-*push_in = TRUE;
-
-gtk_widget_get_allocation( widget, &widget_allocation );
-gtk_widget_get_allocation( GTK_WIDGET(menu), &menu_allocation );
-
-window = gtk_widget_get_window( widget );
-gdk_window_get_position( window, &x, &y );
-
-if (widget_allocation.width > 100)
-gtk_widget_set_size_request(GTK_WIDGET(menu), widget_allocation.width,
-1);
-
-*px = x + widget_allocation.x;
-*py = y + widget_allocation.y + widget_allocation.height;
-}
-
static void
parole_media_list_destroy_menu (GtkWidget *menu)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
