[Xfce4-commits] [apps/parole] 01/01: cpplint: Lines should be <= 120 characters long [whitespace/line_length] [2]
noreply at xfce.org
noreply at xfce.org
Wed May 31 12:28:12 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/parole.
commit ea63bef24f131fc5313b8d2cae63b98ce170ed91
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed May 31 06:28:06 2017 -0400
cpplint: Lines should be <= 120 characters long [whitespace/line_length] [2]
---
src/gst/parole-gst.c | 14 +++--
src/main.c | 48 +++++++++++------
src/misc/parole-pl-parser.c | 8 ++-
src/misc/parole-provider-player.c | 3 +-
src/parole-conf-dialog.c | 8 ++-
src/parole-medialist.c | 20 +++++--
src/parole-player.c | 102 +++++++++++++++++++++++++++--------
src/parole-plugins-manager.c | 12 +++--
src/plugins/mpris2/mpris2-provider.c | 9 +++-
9 files changed, 167 insertions(+), 57 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 89ce3ff..6498d47 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1528,7 +1528,8 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data) {
#endif /* GDK_WINDOWING_X11 */
#if GST_CHECK_VERSION(1, 0, 0)
- gst_install_plugins_async((const gchar * const *) details, ctx, parole_gst_install_plugins_result_func, gst);
+ gst_install_plugins_async((const gchar * const *) details, ctx,
+ parole_gst_install_plugins_result_func, gst);
#else
gst_install_plugins_async(details, ctx, parole_gst_install_plugins_result_func, gst);
#endif
@@ -1795,7 +1796,8 @@ parole_gst_check_state_change_timeout(gpointer data) {
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
_("The stream is taking too much time to load"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), _("Do you want to continue loading or stop?"));
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+ _("Do you want to continue loading or stop?"));
gtk_dialog_add_button(GTK_DIALOG(dialog), _("Stop"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(dialog), _("Continue"), GTK_RESPONSE_CLOSE);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_CANCEL) {
@@ -1844,7 +1846,10 @@ parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst) {
parole_gst_set_subtitle_font(gst);
} else if (!g_strcmp0("subtitle-encoding", spec->name)) {
parole_gst_set_subtitle_encoding(gst);
- } else if (!g_strcmp0("brightness", spec->name) || !g_strcmp0("hue", spec->name) || !g_strcmp0("contrast", spec->name) || !g_strcmp0("saturation", spec->name)) {
+ } else if (!g_strcmp0("brightness", spec->name) ||
+ !g_strcmp0("hue", spec->name) ||
+ !g_strcmp0("contrast", spec->name) ||
+ !g_strcmp0("saturation", spec->name)) {
gst->priv->update_color_balance = TRUE;
if ( gst->priv->state >= GST_STATE_PAUSED )
@@ -2026,7 +2031,8 @@ parole_gst_constructed(GObject *object) {
if (G_UNLIKELY(gst->priv->video_sink == NULL)) {
gst->priv->image_sink = XIMAGESINK;
- g_debug("%s trying to load ximagesink", g_strcmp0(videosink, "xvimagesink") ? "xvimagesink not found " : "xv disabled ");
+ g_debug("%s trying to load ximagesink",
+ g_strcmp0(videosink, "xvimagesink") ? "xvimagesink not found " : "xv disabled ");
gst->priv->video_sink = gst_element_factory_make("ximagesink", "video");
if (G_UNLIKELY(gst->priv->video_sink == NULL)) {
diff --git a/src/main.c b/src/main.c
index c094cd4..a17dc2a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -223,22 +223,38 @@ int main(int argc, char **argv) {
/* Command-line options */
GOptionEntry option_entries[] = {
- { "new-instance", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &new_instance, N_("Open a new instance"), NULL },
- { "no-plugins", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_plugins, N_("Do not load plugins"), NULL },
- { "device", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &device, N_("Set Audio-CD/VCD/DVD device path"), 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 },
- { "play", 'p', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &play, N_("Play or pause if already playing"), NULL },
- { "next", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &next_track, N_("Next track"), NULL },
- { "previous", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &prev_track, N_("Previous track"), NULL },
- { "volume-up", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &raise_volume, N_("Raise volume"), NULL },
- { "volume-down", '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 },
- { "add", 'a', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &enqueue, N_("Add files to playlist"), NULL},
- { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Print version information and exit"), NULL },
- { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &client_id, NULL, NULL },
- {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, N_("Media to play"), NULL},
+ { "new-instance", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &new_instance, N_("Open a new instance"), NULL },
+ { "no-plugins", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &no_plugins, N_("Do not load plugins"), NULL },
+ { "device", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,
+ &device, N_("Set Audio-CD/VCD/DVD device path"), 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 },
+ { "play", 'p', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &play, N_("Play or pause if already playing"), NULL },
+ { "next", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &next_track, N_("Next track"), NULL },
+ { "previous", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &prev_track, N_("Previous track"), NULL },
+ { "volume-up", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &raise_volume, N_("Raise volume"), NULL },
+ { "volume-down", '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 },
+ { "add", 'a', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &enqueue, N_("Add files to playlist"), NULL},
+ { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+ &version, N_("Print version information and exit"), NULL },
+ { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING,
+ &client_id, NULL, NULL },
+ {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY,
+ &filenames, N_("Media to play"), NULL},
{ NULL, },
};
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index e467357..6c6eeb6 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -86,7 +86,9 @@ parole_xspf_xml_start(GMarkupParseContext *context, const gchar *element_name,
}
static void
-parole_xspf_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) {
+parole_xspf_xml_text(GMarkupParseContext *context,
+ const gchar *text, gsize text_len,
+ gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
const gchar *element_name;
@@ -171,7 +173,9 @@ parole_asx_xml_start(GMarkupParseContext *context, const gchar *element_name,
}
static void
-parole_asx_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) {
+parole_asx_xml_text(GMarkupParseContext *context,
+ const gchar *text, gsize text_len,
+ gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
const gchar *element_name;
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index a6a44fa..8aa4498 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -160,7 +160,8 @@ GtkWidget *parole_provider_player_get_main_window(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-void parole_provider_player_pack(ParoleProviderPlayer *player, GtkWidget *widget, const gchar *title, ParolePluginContainer container) {
+void parole_provider_player_pack(ParoleProviderPlayer *player, GtkWidget *widget,
+ const gchar *title, ParolePluginContainer container) {
g_return_if_fail(PAROLE_IS_PROVIDER_PLAYER(player));
if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pack) {
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index f6e7bc1..97c47ce 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -295,7 +295,10 @@ parole_conf_dialog_add_clutter_sink(ParoleConfDialog *dialog, GtkComboBox *combo
/* Set the combobox to the default visualisation plugin */
static gboolean
-parole_conf_dialog_set_default_vis_plugin(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, ParoleConfDialog *self) {
+parole_conf_dialog_set_default_vis_plugin(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ ParoleConfDialog *self) {
GstElementFactory *f;
gchar *vis_name;
gchar *combox_text;
@@ -485,7 +488,8 @@ void parole_conf_dialog_open(ParoleConfDialog *self, GtkWidget *parent) {
g_object_bind_property(G_OBJECT(self->priv->conf), "vis-enabled",
switch_widget, "active",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
- g_signal_connect(G_OBJECT(switch_widget), "notify::active", G_CALLBACK(parole_conf_dialog_enable_vis_changed_cb), self);
+ g_signal_connect(G_OBJECT(switch_widget), "notify::active",
+ G_CALLBACK(parole_conf_dialog_enable_vis_changed_cb), self);
/* General/Keyboard/Enable keyboard multimedia keys */
switch_widget = GTK_WIDGET(gtk_builder_get_object(builder, "multimedia-keys"));
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 669db60..12966ca 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -522,6 +522,13 @@ void parole_media_list_drag_data_received_cb(GtkWidget *widget,
gtk_drag_finish(drag_context, added == i ? TRUE : FALSE, FALSE, drag_time);
}
+static GtkWidget *
+parole_media_list_get_player_widget(ParoleMediaList *list) {
+ GtkWidget *paned = gtk_widget_get_ancestor(GTK_WIDGET(list->priv->view), GTK_TYPE_PANED);
+ GtkWidget *player = GTK_WIDGET(gtk_container_get_children(GTK_CONTAINER(paned))[0].data);
+ return player;
+}
+
gboolean parole_media_list_key_press(GtkWidget *widget, GdkEventKey *ev, ParoleMediaList *list) {
GtkWidget *vbox_player;
switch ( ev->keyval ) {
@@ -534,8 +541,7 @@ gboolean parole_media_list_key_press(GtkWidget *widget, GdkEventKey *ev, ParoleM
case GDK_KEY_Page_Down:
case GDK_KEY_Page_Up:
case GDK_KEY_Escape:
- // FIXME: There has got to be a better way.
- vbox_player = GTK_WIDGET(gtk_container_get_children(GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget))))))) )[0].data);
+ vbox_player = parole_media_list_get_player_widget(list);
gtk_widget_grab_focus(vbox_player);
return TRUE;
break;
@@ -1047,7 +1053,10 @@ parole_media_list_move_down_clicked_cb(GtkButton *button, ParoleMediaList *list)
*
**/
void
-parole_media_list_row_activated_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *col, ParoleMediaList *list) {
+parole_media_list_row_activated_cb(GtkTreeView *view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *col,
+ ParoleMediaList *list) {
GtkTreeRowReference *row;
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
@@ -1717,7 +1726,10 @@ GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list) {
list->priv->n_shuffled_items = 1;
}
- while (g_strcmp0(list->priv->history[0], path_str) == 0 || g_strcmp0(list->priv->history[1], path_str) == 0 || g_strcmp0(list->priv->history[2], path_str) == 0 || g_strcmp0(current_path, path_str) == 0) {
+ while (g_strcmp0(list->priv->history[0], path_str) == 0 ||
+ g_strcmp0(list->priv->history[1], path_str) == 0 ||
+ g_strcmp0(list->priv->history[2], path_str) == 0 ||
+ g_strcmp0(current_path, path_str) == 0) {
path_str = g_strdup_printf("%i", g_random_int_range(0, nch));
count += 1;
if (count >= 10 && g_strcmp0(current_path, path_str) != 0)
diff --git a/src/parole-player.c b/src/parole-player.c
index df98556..f90153f 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -524,7 +524,8 @@ void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibilit
gint window_w, window_h, playlist_w;
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
- gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->showhide_playlist_button), visibility ? _("Hide Playlist") : _("Show Playlist"));
+ gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->showhide_playlist_button),
+ visibility ? _("Hide Playlist") : _("Show Playlist"));
if (gtk_widget_get_visible (player->priv->playlist_nt) == visibility)
return;
@@ -542,7 +543,8 @@ void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibilit
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(player->priv->showhide_playlist_button), visibility);
if ( visibility ) {
if ( !player->priv->full_screen )
- gtk_window_resize(GTK_WINDOW(player->priv->window), window_w+playlist_w+player->priv->handle_width, window_h);
+ gtk_window_resize(GTK_WINDOW(player->priv->window),
+ window_w+playlist_w+player->priv->handle_width, window_h);
gtk_widget_show(player->priv->playlist_nt);
g_object_set(G_OBJECT(player->priv->conf),
@@ -555,7 +557,8 @@ void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibilit
NULL);
if ( !player->priv->full_screen )
- gtk_window_resize(GTK_WINDOW(player->priv->window), window_w-playlist_w-player->priv->handle_width, window_h);
+ gtk_window_resize(GTK_WINDOW(player->priv->window),
+ window_w-playlist_w-player->priv->handle_width, window_h);
}
}
@@ -759,7 +762,8 @@ parole_player_set_subtitles_list(ParolePlayer *player, GList *subtitle_list) {
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, language, -1);
- menu_item = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
+ menu_item = gtk_radio_menu_item_new_with_label_from_widget(
+ GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
gtk_widget_show(menu_item);
gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->subtitles_menu), menu_item);
@@ -833,7 +837,8 @@ parole_player_set_audio_list(ParolePlayer *player, GList *audio_list) {
g_signal_connect(player->priv->audio_group, "activate",
G_CALLBACK(parole_player_audiotrack_radio_menu_item_changed_cb), player);
} else {
- menu_item = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
+ menu_item = gtk_radio_menu_item_new_with_label_from_widget(
+ GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
gtk_widget_show(menu_item);
gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->languages_menu), menu_item);
@@ -1085,7 +1090,8 @@ parole_player_media_activated_cb(ParoleMediaList *list, GtkTreeRowReference *row
parole_file_get_uri(file),
sub);
- gtk_window_set_title(GTK_WINDOW(player->priv->window), parole_media_list_get_row_name(player->priv->list, player->priv->row));
+ gtk_window_set_title(GTK_WINDOW(player->priv->window),
+ parole_media_list_get_row_name(player->priv->list, player->priv->row));
if ( directory ) {
g_object_set(G_OBJECT(player->priv->conf),
@@ -1762,41 +1768,73 @@ parole_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePla
if ( title ) {
parole_media_list_set_row_name(player->priv->list, player->priv->row, title);
gtk_window_set_title(GTK_WINDOW(player->priv->window), title);
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", title));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_title),
+ g_markup_printf_escaped(
+ "<span color='#F4F4F4'><b><big>%s</big></b></span>",
+ title));
g_free(title);
} else {
/* No ID3, no problem! Show the filename instead */
filename = parole_player_get_filename_from_uri(uri);
if ( filename ) {
gtk_window_set_title(GTK_WINDOW(player->priv->window), filename);
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", filename));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_title),
+ g_markup_printf_escaped(
+ "<span color='#F4F4F4'><b><big>%s</big></b></span>",
+ filename));
g_free(filename);
} else {
gtk_window_set_title(GTK_WINDOW(player->priv->window), _("Parole Media Player"));
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", _("Unknown Song")));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_title),
+ g_markup_printf_escaped(
+ "<span color='#F4F4F4'><b><big>%s</big></b></span>",
+ _("Unknown Song")));
}
}
g_free(uri);
if ( album ) {
if (year)
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s (%s)</span></big>", _("on"), album, year));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_album),
+ g_markup_printf_escaped(
+ "<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s (%s)</span></big>",
+ _("on"), album, year));
else
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), album));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_album),
+ g_markup_printf_escaped(
+ "<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>",
+ _("on"), album));
g_free(album);
} else {
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), _("Unknown Album")));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_album),
+ g_markup_printf_escaped(
+ "<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>",
+ _("on"), _("Unknown Album")));
}
if (year)
g_free(year);
if ( artist ) {
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), artist));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_artist),
+ g_markup_printf_escaped(
+ "<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>",
+ _("by"), artist));
g_free(artist);
} else {
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), _("Unknown Artist")));
+ gtk_label_set_markup(
+ GTK_LABEL(player->priv->audiobox_artist),
+ g_markup_printf_escaped(
+ "<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>",
+ _("by"), _("Unknown Artist")));
}
image = parole_stream_get_image(G_OBJECT(stream));
@@ -1804,7 +1842,9 @@ parole_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePla
gtk_image_set_from_pixbuf(GTK_IMAGE(player->priv->audiobox_cover), image);
g_object_unref(image);
} else {
- gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->audiobox_cover), "audio-x-generic-symbolic", GTK_ICON_SIZE_ARTWORK_FALLBACK);
+ gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->audiobox_cover),
+ "audio-x-generic-symbolic",
+ GTK_ICON_SIZE_ARTWORK_FALLBACK);
}
}
}
@@ -2062,7 +2102,9 @@ parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
gtk_widget_set_sensitive(mi, sensitive);
gtk_widget_show(mi);
- g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_playpause_action);
+ g_signal_connect(G_OBJECT(mi), "activate",
+ G_CALLBACK(parole_player_widget_activate_action),
+ player->priv->media_playpause_action);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
@@ -2071,7 +2113,9 @@ parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
mi = gtk_menu_item_new_with_mnemonic(_("_Previous"));
gtk_widget_set_sensitive(mi, (player->priv->state >= PAROLE_STATE_PAUSED));
gtk_widget_show(mi);
- g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_previous_action);
+ g_signal_connect(G_OBJECT(mi), "activate",
+ G_CALLBACK(parole_player_widget_activate_action),
+ player->priv->media_previous_action);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
@@ -2080,7 +2124,9 @@ parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
mi = gtk_menu_item_new_with_mnemonic(_("_Next"));
gtk_widget_set_sensitive(mi, (player->priv->state >= PAROLE_STATE_PAUSED));
gtk_widget_show(mi);
- g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_next_action);
+ g_signal_connect(G_OBJECT(mi), "activate",
+ G_CALLBACK(parole_player_widget_activate_action),
+ player->priv->media_next_action);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
/*
@@ -2088,7 +2134,9 @@ parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
*/
mi = gtk_menu_item_new_with_mnemonic(player->priv->full_screen ? _("_Leave Fullscreen"):_("_Fullscreen"));
gtk_widget_show(mi);
- g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_fullscreen_action);
+ g_signal_connect(G_OBJECT(mi), "activate",
+ G_CALLBACK(parole_player_widget_activate_action),
+ player->priv->media_fullscreen_action);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
if (!player->priv->full_screen) {
@@ -2606,7 +2654,9 @@ parole_player_key_press(GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player
switch (ev->keyval) {
case GDK_KEY_F11:
- if ( player->priv->embedded != TRUE ) g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
+ if ( player->priv->embedded != TRUE ) {
+ g_action_activate(G_ACTION(player->priv->media_fullscreen_action), NULL);
+ }
return TRUE;
default:
break;
@@ -2721,7 +2771,10 @@ static void
on_bug_report_clicked(GtkWidget *w, ParolePlayer *player) {
GtkWidget *dialog;
#if GTK_CHECK_VERSION(3, 22, 0)
- if (!gtk_show_uri_on_window(GTK_WINDOW(player->priv->window), "https://docs.xfce.org/apps/parole/bugs", GDK_CURRENT_TIME, NULL)) {
+ if (!gtk_show_uri_on_window(GTK_WINDOW(player->priv->window),
+ "https://docs.xfce.org/apps/parole/bugs",
+ GDK_CURRENT_TIME,
+ NULL)) {
#else
if (!gtk_show_uri(NULL, "https://docs.xfce.org/apps/parole/bugs", GDK_CURRENT_TIME, NULL)) {
#endif
@@ -3460,7 +3513,9 @@ parole_player_init(ParolePlayer *player) {
gtk_widget_add_events(GTK_WIDGET(play_box), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
g_signal_connect(G_OBJECT(play_box), "motion-notify-event",
G_CALLBACK(parole_player_gst_widget_motion_notify_event), player);
- for (widgets = gtk_container_get_children(GTK_CONTAINER(play_box)); widgets != NULL; widgets = g_list_next(widgets)) {
+ for (widgets = gtk_container_get_children(GTK_CONTAINER(play_box));
+ widgets != NULL;
+ widgets = g_list_next(widgets)) {
gtk_widget_add_events(GTK_WIDGET(widgets->data), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
g_signal_connect(G_OBJECT(widgets->data), "motion-notify-event",
G_CALLBACK(parole_player_gst_widget_motion_notify_event), player);
@@ -3506,7 +3561,8 @@ parole_player_init(ParolePlayer *player) {
// Initialize the Audio Track combobox
player->priv->liststore_audiotrack = gtk_list_store_new(1, G_TYPE_STRING);
- player->priv->combobox_audiotrack = gtk_combo_box_new_with_model(GTK_TREE_MODEL(player->priv->liststore_audiotrack));
+ player->priv->combobox_audiotrack = gtk_combo_box_new_with_model(
+ GTK_TREE_MODEL(player->priv->liststore_audiotrack));
player->priv->audio_list = NULL;
cell = gtk_cell_renderer_text_new();
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 5a89ca4..be16f5e 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -149,7 +149,9 @@ void parole_plugins_manager_pref_response_cb(GtkDialog *dialog, gint reponse_id,
}
static void
-parole_plugins_manager_get_selected_module_data(PrefData *pref, ParoleProviderModule **module, ParolePluginInfo **info) {
+parole_plugins_manager_get_selected_module_data(PrefData *pref,
+ ParoleProviderModule **module,
+ ParolePluginInfo **info) {
GtkTreeModel *model;
GtkTreeSelection *sel;
GtkTreeIter iter;
@@ -247,7 +249,9 @@ parole_plugins_manager_cell_toggled_cb(GtkCellRendererToggle *cell_renderer,
g_type_module_use(G_TYPE_MODULE(module));
if (!parole_provider_module_new_plugin(module)) {
// If plugin loading fails...
- parole_dialog_error(GTK_WINDOW(pref->window), _("Plugin failed to load"), _("Please check your installation"));
+ parole_dialog_error(GTK_WINDOW(pref->window),
+ _("Plugin failed to load"),
+ _("Please check your installation"));
parole_provider_module_free_plugin(module);
g_type_module_unuse(G_TYPE_MODULE(module));
active = FALSE;
@@ -662,7 +666,9 @@ void parole_plugins_manager_load(ParolePluginsManager *manager) {
}
void
-parole_plugins_manager_pack(ParolePluginsManager *manager, GtkWidget *widget, const gchar *title, ParolePluginContainer container) {
+parole_plugins_manager_pack(ParolePluginsManager *manager,
+ GtkWidget *widget, const gchar *title,
+ ParolePluginContainer container) {
if ( container == PAROLE_PLUGIN_CONTAINER_PLAYLIST ) {
gtk_notebook_append_page(GTK_NOTEBOOK(manager->priv->list_nt), widget, gtk_label_new(title));
gtk_widget_show_all(widget);
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index c85f547..f117836 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -333,7 +333,9 @@ static void mpris_Player_Seek(GDBusMethodInvocation *invocation, GVariant* param
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_SetPosition(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
+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;
@@ -708,7 +710,10 @@ static void parole_mpris_update_any(Mpris2Provider *provider) {
static void
-state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, Mpris2Provider *provider) {
+state_changed_cb(ParoleProviderPlayer *player,
+ const ParoleStream *stream,
+ ParoleState state,
+ Mpris2Provider *provider) {
parole_mpris_update_any(provider);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list