[Xfce4-commits] [apps/parole] 01/01: cpplint: Whitespace Fixes Mismatching spaces inside () in if [whitespace/parens] [5] Missing space after , [whitespace/comma] [3] Missing space before ( in if( [whitespace/parens] [5] Missing space before ( in switch( [whitespace/parens] [5] Missing space before { [whitespace/braces] [5] Missing spaces around < [whitespace/operators] [3] Line contains only semicolon. If this should be an empty statement, use {} instead. [whitespace/semicolon] [5]
noreply at xfce.org
noreply at xfce.org
Sun May 28 16:45:33 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 0464661a04b6b33365ca81257fa0dd100c5f6d65
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun May 28 10:44:57 2017 -0400
cpplint: Whitespace Fixes
Mismatching spaces inside () in if [whitespace/parens] [5]
Missing space after , [whitespace/comma] [3]
Missing space before ( in if( [whitespace/parens] [5]
Missing space before ( in switch( [whitespace/parens] [5]
Missing space before { [whitespace/braces] [5]
Missing spaces around < [whitespace/operators] [3]
Line contains only semicolon. If this should be an empty statement, use {} instead. [whitespace/semicolon] [5]
---
src/gst/parole-gst.c | 24 ++++++++++----------
src/main.c | 4 ++--
src/misc/parole-pl-parser.c | 20 ++++++++--------
src/parole-clutter.c | 2 +-
src/parole-conf.c | 2 +-
src/parole-disc.c | 8 +++----
src/parole-medialist.c | 18 +++++++--------
src/parole-player.c | 24 ++++++++++----------
src/parole-utils.c | 16 ++++++-------
src/plugins/mpris2/mpris2-provider.c | 44 ++++++++++++++++++------------------
10 files changed, 79 insertions(+), 83 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 5bdd894..d060720 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -228,7 +228,7 @@ parole_gst_realize (GtkWidget *widget)
ParoleGst *gst;
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
GdkWindowAttr attr;
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3, 22, 0)
#else
GdkRGBA color;
#endif
@@ -260,7 +260,7 @@ parole_gst_realize (GtkWidget *widget)
gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3, 22, 0)
#else
gdk_rgba_parse (&color, "black");
gdk_window_set_background_rgba (gtk_widget_get_window(widget), &color);
@@ -558,12 +558,12 @@ parole_gst_tick (ParoleGst *gst)
"live", &live,
NULL);
- if ( gst->priv->state >= GST_STATE_PAUSED && !live) {
- if ( gst->priv->tick_id != 0 ) {
+ if (gst->priv->state >= GST_STATE_PAUSED && !live) {
+ if (gst->priv->tick_id != 0) {
return;
}
gst->priv->tick_id = g_timeout_add (250, (GSourceFunc) parole_gst_tick_timeout, gst);
- } else if ( gst->priv->tick_id != 0) {
+ } else if (gst->priv->tick_id != 0) {
g_source_remove (gst->priv->tick_id);
gst->priv->tick_id = 0;
}
@@ -903,11 +903,11 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
g_signal_emit (G_OBJECT (gst), signals [MEDIA_STATE], 0,
gst->priv->stream, PAROLE_STATE_STOPPED);
- if ( gst->priv->target == GST_STATE_PLAYING && pending < GST_STATE_PAUSED) {
+ if (gst->priv->target == GST_STATE_PLAYING && pending < GST_STATE_PAUSED) {
parole_gst_play_file_internal (gst);
- } else if ( gst->priv->target == GST_STATE_PAUSED) {
+ } else if (gst->priv->target == GST_STATE_PAUSED) {
parole_gst_change_state (gst, GST_STATE_PAUSED);
- } else if ( gst->priv->target == GST_STATE_READY) {
+ } else if (gst->priv->target == GST_STATE_READY) {
gtk_widget_get_allocation( GTK_WIDGET (gst), allocation );
parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
g_free(allocation);
@@ -944,7 +944,7 @@ parole_gst_element_message_sync (GstBus *bus, GstMessage *message, ParoleGst *gs
#if GST_CHECK_VERSION (1, 0, 0)
#else
out:
- ;
+ {}
#endif
}
@@ -1969,9 +1969,9 @@ parole_gst_conf_notify_cb (GObject *object, GParamSpec *spec, ParoleGst *gst)
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
if ( !g_strcmp0 ("vis-enabled", spec->name) || !g_strcmp0 ("vis-name", spec->name) ) {
gst->priv->update_vis = TRUE;
- } else if ( !g_strcmp0 ("subtitle-font", spec->name) || !g_strcmp0 ("enable-subtitle", spec->name) ) {
+ } else if (!g_strcmp0("subtitle-font", spec->name) || !g_strcmp0("enable-subtitle", spec->name)) {
parole_gst_set_subtitle_font (gst);
- } else if (!g_strcmp0 ("subtitle-encoding", spec->name) ) {
+ } 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) )
@@ -2838,7 +2838,7 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar * type_name)
if ( gst->priv->use_custom_subtitles == TRUE )
{
- ret = g_list_append (ret, g_strdup_printf("%s",gst->priv->custom_subtitles));
+ ret = g_list_append (ret, g_strdup_printf("%s", gst->priv->custom_subtitles));
}
} else {
g_critical ("Invalid stream type '%s'", type_name);
diff --git a/src/main.c b/src/main.c
index 2551108..c6f77ed 100644
--- a/src/main.c
+++ b/src/main.c
@@ -345,7 +345,7 @@ int main (int argc, char **argv)
parole_player_full_screen (player, TRUE);
if ( filenames && filenames[0] != NULL ) {
- if ( g_strv_length (filenames) == 1 && parole_is_uri_disc (filenames[0])) {
+ if (g_strv_length (filenames) == 1 && parole_is_uri_disc (filenames[0])) {
parole_player_play_uri_disc (player, filenames[0], device);
} else {
ParoleMediaList *list;
@@ -356,7 +356,7 @@ int main (int argc, char **argv)
parole_player_play_uri_disc (player, NULL, device);
}
- if ( xfce_posix_signal_handler_init (&error)) {
+ if (xfce_posix_signal_handler_init (&error)) {
xfce_posix_signal_handler_set_handler(SIGHUP,
parole_sig_handler,
player, NULL);
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 0fb6e80..36619d6 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -101,7 +101,7 @@ parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize tex
element_name = g_markup_parse_context_get_element (context);
- if (!g_ascii_strcasecmp (element_name, "location") ) {
+ if (!g_ascii_strcasecmp (element_name, "location")) {
if (data->uri) {
g_free (data->uri);
data->uri = NULL;
@@ -109,7 +109,7 @@ parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize tex
if (text_len > 0)
data->uri = g_strdup (text);
- } else if (!g_ascii_strcasecmp (element_name, "title") ) {
+ } else if (!g_ascii_strcasecmp (element_name, "title")) {
if (data->title) {
g_free (data->title);
data->title = NULL;
@@ -266,10 +266,10 @@ parole_pl_parser_parse_asx (const gchar *filename)
file = g_file_new_for_path (filename);
- if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
+ if (!g_file_load_contents (file, NULL, &contents, &size, NULL, NULL))
goto out;
- if ( g_utf8_validate (contents, -1, NULL) == FALSE) {
+ if (g_utf8_validate (contents, -1, NULL) == FALSE) {
gchar *fixed;
fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
if (fixed != NULL) {
@@ -328,21 +328,19 @@ parole_pl_parser_parse_m3u (const gchar *filename)
file = g_file_new_for_path (filename);
path = g_path_get_dirname(filename);
- if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
+ if (!g_file_load_contents (file, NULL, &contents, &size, NULL, NULL))
goto out;
- if ( g_utf8_validate (contents, -1, NULL) == FALSE)
- {
+ if (g_utf8_validate (contents, -1, NULL) == FALSE) {
gchar *fixed;
fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
- if (fixed != NULL)
- {
+ if (fixed != NULL) {
g_free (contents);
contents = fixed;
}
}
- if ( strstr (contents,"\x0d") == NULL) {
+ if (strstr (contents, "\x0d") == NULL) {
split_char = "\n";
} else {
split_char = "\x0d\n";
@@ -357,7 +355,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
num_lines = g_strv_length (lines);
num_lines--; /* Drop the terminating NULL */
- for ( i = 0; lines[i] != NULL; i++) {
+ for (i = 0; lines[i] != NULL; i++) {
if ( lines[i][0] == '\0' || lines[i][0] == '#')
continue;
diff --git a/src/parole-clutter.c b/src/parole-clutter.c
index 1a90674..68b9c0e 100644
--- a/src/parole-clutter.c
+++ b/src/parole-clutter.c
@@ -320,7 +320,7 @@ parole_clutter_init (ParoleClutter *clutter)
g_value_init(&value, G_TYPE_BOOLEAN);
g_value_set_boolean(&value, TRUE);
- black = clutter_color_new(0,0,0,255);
+ black = clutter_color_new(0, 0, 0, 255);
clutter->priv->embed = gtk_clutter_embed_new();
g_signal_connect (G_OBJECT(clutter->priv->embed), "size-allocate",
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 319721d..496c383 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -187,7 +187,7 @@ static void parole_conf_set_property (GObject *object,
g_signal_handler_unblock (conf->channel, conf->property_changed_id);
/* now we can notify the plugins */
- switch(prop_id)
+ switch (prop_id)
{
/* sadly this one recurses */
case PROP_VOLUME:
diff --git a/src/parole-disc.c b/src/parole-disc.c
index 379cb37..025a11d 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -139,8 +139,7 @@ parole_disc_set_kind(ParoleDisc *disc, ParoleDiscKind kind)
{
gboolean enabled = TRUE;
- switch (kind)
- {
+ switch (kind) {
case PAROLE_DISC_CDDA:
break;
case PAROLE_DISC_SVCD:
@@ -189,8 +188,7 @@ parole_disc_show_menu_item (ParoleDisc *disc, MountData *data, const gchar *labe
parole_disc_set_kind (disc, data->kind);
parole_disc_set_label(disc, label);
- if (parole_disc_get_enabled(disc))
- {
+ if (parole_disc_get_enabled(disc)) {
data->mi = disc->priv->disc_menu_item;
g_object_set_data (G_OBJECT (data->mi),
@@ -359,7 +357,7 @@ parole_disc_check_cdrom (ParoleDisc *disc, GVolume *volume, const gchar *device)
close (fd);
out:
- ;
+ {}
#endif /* if defined(__linux__) */
}
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 792216c..0dd199a 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1065,7 +1065,7 @@ parole_media_list_move_up_clicked_cb (GtkButton *button, ParoleMediaList *list)
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, prev))
{
/* Move each item about the previous path */
- for (i=0; i<g_list_length(path_list); i++)
+ for (i=0; i < g_list_length(path_list); i++)
{
path = g_list_nth_data (path_list, i);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
@@ -1114,7 +1114,7 @@ parole_media_list_move_down_clicked_cb (GtkButton *button, ParoleMediaList *list
if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, next))
{
/* Move each item about the previous path */
- for (i=0; i<g_list_length(path_list); i++)
+ for (i=0; i < g_list_length(path_list); i++)
{
path = g_list_nth_data (path_list, i);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
@@ -1168,7 +1168,7 @@ parole_media_list_open_folder (GtkWidget *menu)
gchar *uri;
uri = g_filename_to_uri (dirname, NULL, NULL);
TRACE ("Opening %s", dirname);
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window (GTK_WINDOW (gtk_menu_get_attach_widget (GTK_MENU (menu))), uri, GDK_CURRENT_TIME, NULL);
#else
gtk_show_uri (gtk_widget_get_screen (menu), uri, GDK_CURRENT_TIME, NULL);
@@ -1314,7 +1314,7 @@ static void
parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
{
gboolean val;
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3, 22, 0)
#else
guint button = ev->button;
guint activate_time = ev->time;
@@ -1365,7 +1365,7 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
g_signal_connect_swapped (menu, "selection-done",
G_CALLBACK (parole_media_list_destroy_menu), menu);
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
#else
gtk_menu_popup (GTK_MENU (menu),
@@ -1528,7 +1528,7 @@ parole_media_list_setup_view (ParoleMediaList *list)
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));
-#if GTK_CHECK_VERSION(3,14,0)
+#if GTK_CHECK_VERSION(3, 14, 0)
#else
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list->priv->view), TRUE);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list->priv->disc_view), TRUE);
@@ -1754,11 +1754,11 @@ GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list,
gtk_tree_path_next (path);
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path)) {
+ if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path)) {
next = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
//parole_media_list_select_path (list, path);
} else if ( repeat ) { /* Repeat playing ?*/
- if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter)) {
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter)) {
next = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
}
}
@@ -1784,7 +1784,7 @@ GtkTreeRowReference *parole_media_list_get_prev_row (ParoleMediaList *list,
gtk_tree_path_prev (path);
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path)) {
+ if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path)) {
prev = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
//parole_media_list_select_path (list, path);
} else {
diff --git a/src/parole-player.c b/src/parole-player.c
index 931dc50..6fe5844 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -736,7 +736,7 @@ parole_player_update_chapters (ParolePlayer *player, gint chapter_count)
GtkWidget *menu_item;
parole_player_clear_chapters(player);
- for (chapter_id=0; chapter_id<chapter_count; chapter_id++)
+ for (chapter_id=0; chapter_id < chapter_count; chapter_id++)
{
menu_item = GTK_WIDGET(gtk_menu_item_new_with_label (g_strdup_printf(_("Chapter %i"), chapter_id+1)));
gtk_widget_show (menu_item);
@@ -1436,7 +1436,7 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
gtk_widget_set_sensitive (player->priv->range, seekable);
player->priv->internal_range_change = TRUE;
- if ( live || duration == 0) {
+ if (live || duration == 0) {
parole_player_change_range_value (player, 0);
gtk_widget_set_visible( player->priv->label_duration, FALSE );
gtk_widget_set_visible( player->priv->label_divider, FALSE );
@@ -1448,7 +1448,7 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
gtk_widget_set_visible( player->priv->label_elapsed, TRUE );
}
- if ( duration != 0) {
+ if (duration != 0) {
gchar dur_text[128];
get_time_string (dur_text, duration);
@@ -1748,7 +1748,7 @@ void parole_player_previous_action_cb (GSimpleAction *action)
GSimpleAction *parole_player_get_action(ParolePlayerAction action)
{
- switch(action)
+ switch (action)
{
case PAROLE_PLAYER_ACTION_PLAYPAUSE:
return playpause_action;
@@ -2258,7 +2258,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
g_signal_connect_swapped (menu, "selection-done",
G_CALLBACK (gtk_widget_destroy), menu);
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
#else
gtk_menu_popup (GTK_MENU (menu),
@@ -2898,7 +2898,7 @@ static void
on_bug_report_clicked (GtkWidget *w, ParolePlayer *player)
{
GtkWidget *dialog;
-#if GTK_CHECK_VERSION(3,22,0)
+#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))
#else
if (!gtk_show_uri(NULL, "https://docs.xfce.org/apps/parole/bugs", GDK_CURRENT_TIME, NULL))
@@ -3023,7 +3023,7 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
GtkStyleContext *context;
-#if GTK_CHECK_VERSION(3,16,0)
+#if GTK_CHECK_VERSION(3, 16, 0)
#else
GdkRGBA acolor;
#endif
@@ -3036,7 +3036,7 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
gtk_style_context_add_class (context, "background");
gtk_style_context_add_class (context, "osd");
-#if GTK_CHECK_VERSION(3,16,0)
+#if GTK_CHECK_VERSION(3, 16, 0)
#else
gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
gdk_cairo_set_source_rgba (cr, &acolor);
@@ -3177,7 +3177,7 @@ parole_player_set_cursor_visible (ParolePlayer *player, gboolean visible)
static void
parole_player_window_notify_is_active (ParolePlayer *player)
{
- if (!gtk_window_is_active (GTK_WINDOW (player->priv->window)) ) {
+ if (!gtk_window_is_active (GTK_WINDOW (player->priv->window))) {
parole_player_set_cursor_visible (player, TRUE);
} else {
parole_player_set_cursor_visible (player, FALSE);
@@ -3252,7 +3252,7 @@ parole_player_init (ParolePlayer *player)
GtkWidget *controls_overlay;
GtkWidget *controls_parent;
GtkWidget *play_box;
-#if GTK_CHECK_VERSION(3,16,0)
+#if GTK_CHECK_VERSION(3, 16, 0)
#else
GdkRGBA background;
#endif
@@ -3444,7 +3444,7 @@ parole_player_init (ParolePlayer *player)
/* Content Area (Background, Audio, Video) */
player->priv->eventbox_output = GTK_WIDGET (gtk_builder_get_object (builder, "content_area"));
-#if GTK_CHECK_VERSION(3,16,0)
+#if GTK_CHECK_VERSION(3, 16, 0)
#else
gdk_rgba_parse(&background, "black");
gtk_widget_override_background_color(GTK_WIDGET(player->priv->eventbox_output), GTK_STATE_NORMAL, &background);
@@ -3679,7 +3679,7 @@ parole_player_init (ParolePlayer *player)
player->priv->mute = GTK_WIDGET (gtk_builder_get_object (builder, "volume-mute-menu"));
parole_player_change_volume (player, (gdouble) (volume/100.));
- gtk_widget_set_direction (GTK_WIDGET (gtk_builder_get_object (builder, "ltrbox")),GTK_TEXT_DIR_LTR);
+ gtk_widget_set_direction (GTK_WIDGET (gtk_builder_get_object (builder, "ltrbox")), GTK_TEXT_DIR_LTR);
g_signal_connect(player->priv->control, "draw", G_CALLBACK(parole_overlay_expose_event), NULL);
/* End Media Controls */
diff --git a/src/parole-utils.c b/src/parole-utils.c
index 114eab7..2d4490e 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -361,40 +361,40 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
gtk_main_iteration_do (FALSE);
- if ( g_file_test (path, G_FILE_TEST_IS_REGULAR ) ) {
+ if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
file = parole_file_new (path);
if ( parole_file_filter (playlist_filter, file) &&
parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN )
{
playlist = parole_pl_parser_parse_from_file_by_extension (path);
g_object_unref (file);
- if ( playlist) {
+ if (playlist) {
*list = g_slist_concat (*list, playlist);
}
- } else if ( parole_file_filter (filter, file) ) {
+ } else if (parole_file_filter (filter, file)) {
*list = g_slist_append (*list, file);
} else {
g_object_unref (file);
}
- } else if ( g_file_test (path, G_FILE_TEST_IS_DIR ) ) {
+ } else if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
dir = g_dir_open (path, 0, NULL);
if ( G_UNLIKELY (dir == NULL) )
return;
- while ( (name = g_dir_read_name (dir)) )
+ while ((name = g_dir_read_name (dir)))
{
gchar *path_internal = g_build_filename (path, name, NULL);
- if ( g_file_test (path_internal, G_FILE_TEST_IS_DIR) && recursive) {
+ if (g_file_test (path_internal, G_FILE_TEST_IS_DIR) && recursive) {
parole_get_media_files (filter, path_internal, TRUE, list);
} else if ( g_file_test (path_internal, G_FILE_TEST_IS_REGULAR) ) {
file = parole_file_new (path_internal);
- if ( parole_file_filter (playlist_filter, file) &&
+ if (parole_file_filter (playlist_filter, file) &&
parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN)
{
playlist = parole_pl_parser_parse_from_file_by_extension (path_internal);
g_object_unref (file);
- if ( playlist) {
+ if (playlist) {
*list = g_slist_concat (*list, playlist);
}
} else if ( parole_file_filter (filter, file) ) {
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index 5f4233f..63a14bc 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -119,15 +119,15 @@ static const gchar mpris2xml[] =
/* some MFCisms */
#define BEGIN_INTERFACE(x) \
- if(g_quark_try_string(interface_name)==provider->interface_quarks[x]) {
-#define MAP_METHOD(x,y) \
- if(!g_strcmp0(#y, method_name)) { \
+ 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; }
-#define PROPGET(x,y) \
- if(!g_strcmp0(#y, property_name)) \
+#define PROPGET(x, y) \
+ 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)) \
+#define PROPPUT(x, y) \
+ if (g_quark_try_string(property_name) == g_quark_from_static_string(#y)) \
mpris_##x##_put_##y(value, error, provider);
#define END_INTERFACE }
@@ -137,10 +137,10 @@ static const gchar mpris2xml[] =
static void mpris_Root_Raise (GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
{
GtkWidget *widget = parole_provider_player_get_main_window(provider->player);
- if(widget)
+ if (widget)
{
GdkWindow *window = gtk_widget_get_window(widget);
- if(window)
+ if (window)
{
gdk_window_raise(window);
}
@@ -257,7 +257,7 @@ static void mpris_Player_Play (GDBusMethodInvocation *invocation, GVariant* para
ParoleProviderPlayer *player = provider->player;
ParoleState state = parole_provider_player_get_state (player);
- switch(state)
+ switch (state)
{
case PAROLE_STATE_PAUSED:
parole_provider_player_resume (provider->player);
@@ -303,7 +303,7 @@ static void mpris_Player_PlayPause (GDBusMethodInvocation *invocation, GVariant*
ParoleProviderPlayer *player = provider->player;
ParoleState state = parole_provider_player_get_state (player);
- switch(state)
+ switch (state)
{
case PAROLE_STATE_PAUSED:
parole_provider_player_resume (player);
@@ -339,7 +339,7 @@ static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant* para
gint64 seek;
gint64 duration;
- if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
+ 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;
@@ -368,7 +368,7 @@ static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation, GVarian
gint64 seek;
gint64 duration;
- if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
+ 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;
@@ -401,7 +401,7 @@ static void mpris_Player_OpenUri (GDBusMethodInvocation *invocation, GVariant* p
g_free(uri);
}
- if(happened)
+ if (happened)
g_dbus_method_invocation_return_value (invocation, NULL);
else
g_dbus_method_invocation_return_error_literal (invocation,
@@ -473,7 +473,7 @@ static GVariant * handle_get_trackid(const ParoleStream *stream)
{
// TODO: Returning a path requires TrackList interface implementation
gchar *o = alloca(260);
- if(NULL == stream)
+ if (NULL == stream)
return g_variant_new_object_path("/");
g_snprintf(o, 260, "%s/TrackList/%p", MPRIS_PATH, stream);
@@ -600,9 +600,9 @@ static void mpris_Player_put_Volume (GVariant *value, GError **error, Mpris2Prov
{
gdouble volume = g_variant_get_double(value);
- if(volume < 0.0)
+ if (volume < 0.0)
volume = 0.0;
- if(volume > 1.0)
+ if (volume > 1.0)
volume = 1.0;
g_object_set(G_OBJECT(provider->conf), "volume", (gint) (volume * 100.0), NULL);
@@ -690,7 +690,7 @@ static void parole_mpris_update_any (Mpris2Provider *provider)
ParoleProviderPlayer *player = provider->player;
- if(NULL == provider->dbus_connection)
+ if (NULL == provider->dbus_connection)
return; /* better safe than sorry */
g_debug ("MPRIS: update any");
@@ -703,7 +703,7 @@ static void parole_mpris_update_any (Mpris2Provider *provider)
g_variant_builder_init(&b, G_VARIANT_TYPE("a{sv}"));
g_object_get (G_OBJECT (provider->conf), "shuffle", &shuffle, NULL);
- if(provider->saved_shuffle != shuffle) {
+ if (provider->saved_shuffle != shuffle) {
change_detected = TRUE;
provider->saved_shuffle = shuffle;
g_variant_builder_add (&b, "{sv}", "Shuffle", mpris_Player_get_Shuffle (NULL, provider));
@@ -729,9 +729,9 @@ static void parole_mpris_update_any (Mpris2Provider *provider)
g_variant_builder_add (&b, "{sv}", "Volume", mpris_Player_get_Volume (NULL, provider));
}
if (parole_provider_player_get_state (player) == PAROLE_STATE_PLAYING) {
- if(g_strcmp0(provider->saved_title, stream_uri)) {
+ if (g_strcmp0(provider->saved_title, stream_uri)) {
change_detected = TRUE;
- if(provider->saved_title)
+ if (provider->saved_title)
g_free(provider->saved_title);
if (stream_uri && (stream_uri)[0])
provider->saved_title = stream_uri;
@@ -773,7 +773,7 @@ seeked_cb (ParoleProviderPlayer *player, Mpris2Provider *provider)
{
gint64 position = 0;
- if(NULL == provider->dbus_connection)
+ if (NULL == provider->dbus_connection)
return; /* better safe than sorry */
position = (gint64) parole_provider_player_get_stream_position (provider->player);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list