diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/egg-play-preview.c | 4 | ||||
| -rw-r--r-- | src/gconf-bridge.c | 38 | ||||
| -rw-r--r-- | src/gconf-bridge.h | 6 | ||||
| -rw-r--r-- | src/sj-about.c | 8 | ||||
| -rw-r--r-- | src/sj-about.h | 2 | ||||
| -rw-r--r-- | src/sj-extracting.c | 82 | ||||
| -rw-r--r-- | src/sj-extracting.h | 2 | ||||
| -rw-r--r-- | src/sj-genres.c | 2 | ||||
| -rw-r--r-- | src/sj-genres.h | 2 | ||||
| -rw-r--r-- | src/sj-inhibit.c | 6 | ||||
| -rw-r--r-- | src/sj-inhibit.h | 4 | ||||
| -rw-r--r-- | src/sj-main.h | 2 | ||||
| -rw-r--r-- | src/sj-play.c | 12 | ||||
| -rw-r--r-- | src/sj-play.h | 2 | ||||
| -rw-r--r-- | src/sj-prefs.c | 22 | ||||
| -rw-r--r-- | src/sj-prefs.h | 2 | ||||
| -rw-r--r-- | src/sound-juicer.h | 2 |
17 files changed, 99 insertions, 99 deletions
diff --git a/src/egg-play-preview.c b/src/egg-play-preview.c index 26ee9c6..4e88d34 100644 --- a/src/egg-play-preview.c +++ b/src/egg-play-preview.c @@ -2,7 +2,7 @@ /* * EggPlayPreview GTK+ Widget - egg-play-preview.c - * + * * Copyright (C) 2008 Luca Cavalli <luca.cavalli@gmail.com> * * This program is free software; you can redistribute it and/or @@ -374,7 +374,7 @@ egg_play_preview_set_property (GObject *object, } } -static void +static void egg_play_preview_get_property (GObject *object, guint prop_id, GValue *value, diff --git a/src/gconf-bridge.c b/src/gconf-bridge.c index 88fc67f..25f192f 100644 --- a/src/gconf-bridge.c +++ b/src/gconf-bridge.c @@ -1,4 +1,4 @@ -/* +/* * (C) 2005 OpenedHand Ltd. * * Author: Jorn Baayen <jorn@openedhand.com> @@ -29,7 +29,7 @@ struct _GConfBridge { GConfClient *client; - + GHashTable *bindings; }; @@ -43,7 +43,7 @@ typedef enum { typedef struct { BindingType type; guint id; - + gboolean delayed_mode; char *key; @@ -153,7 +153,7 @@ gconf_bridge_get (void) * gconf_bridge_get_client * @bridge: A #GConfBridge * - * Returns the #GConfClient used by @bridge. This is the same #GConfClient + * Returns the #GConfClient used by @bridge. This is the same #GConfClient * as returned by gconf_client_get_default(). * * Return value: A #GConfClient. @@ -187,7 +187,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, GConfValue *pref_value) { GValue src_value, value; - + /* Make sure we don't enter an infinite synchronizing loop */ g_signal_handler_block (binding->object, binding->prop_notify_id); @@ -233,7 +233,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, "transform a \"%s\" to a \"%s\".", g_type_name (src_value.g_type), g_type_name (value.g_type)); - + goto done; } @@ -243,7 +243,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, g_object_set_property (binding->object, binding->prop->name, &src_value); } - + done: g_value_unset (&src_value); g_value_unset (&value); @@ -401,7 +401,7 @@ prop_binding_pref_changed (GConfClient *client, prop_binding_sync_pref_to_prop (binding, gconf_value); } -/* Performs a scheduled prop-to-pref sync for a prop binding in +/* Performs a scheduled prop-to-pref sync for a prop binding in * delay mode */ static gboolean prop_binding_perform_scheduled_sync (PropBinding *binding) @@ -411,7 +411,7 @@ prop_binding_perform_scheduled_sync (PropBinding *binding) binding->sync_timeout_id = 0; g_object_unref (binding->object); - + return FALSE; } @@ -455,7 +455,7 @@ prop_binding_object_destroyed (gpointer user_data, binding = (PropBinding *) user_data; binding->object = NULL; /* Don't do anything with the object at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -520,7 +520,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge, binding->object = object; binding->prop = pspec; binding->sync_timeout_id = 0; - + /* Watch GConf key */ binding->val_notify_id = gconf_client_notify_add (bridge->client, key, @@ -561,7 +561,7 @@ prop_binding_unbind (PropBinding *binding) if (binding->delayed_mode && binding->sync_timeout_id > 0) { /* Perform any scheduled syncs */ g_source_remove (binding->sync_timeout_id); - + /* The object will still be around as we have * a reference */ prop_binding_perform_scheduled_sync (binding); @@ -700,7 +700,7 @@ window_binding_window_destroyed (gpointer user_data, binding = (WindowBinding *) user_data; binding->window = NULL; /* Don't do anything with the window at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -712,7 +712,7 @@ window_binding_window_destroyed (gpointer user_data, * @window: A #GtkWindow * @bind_size: TRUE to bind the size of @window * @bind_pos: TRUE to bind the position of @window - * + * * On calling this function @window will be resized to the values * specified by "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height" * and maximixed if "@key_prefix<!-- -->_maximized is TRUE if @@ -788,7 +788,7 @@ gconf_bridge_bind_window (GConfBridge *bridge, if (bind_pos) { char *key; GConfValue *x_val, *y_val; - + key = g_strconcat (key_prefix, "_x", NULL); x_val = gconf_client_get (bridge->client, key, NULL); g_free (key); @@ -881,7 +881,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding, binding->row_inserted_id); g_signal_handler_block (binding->list_store, binding->row_deleted_id); - + gtk_list_store_clear (binding->list_store); list = gconf_value_get_list (value); @@ -998,7 +998,7 @@ list_store_binding_store_destroyed (gpointer user_data, binding = (ListStoreBinding *) user_data; binding->list_store = NULL; /* Don't do anything with the store at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -1021,7 +1021,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding) * @bridge: A #GConfBridge * @key: A GConf key to be bound * @list_store: A #GtkListStore - * + * * On calling this function single string column #GtkListStore @list_store * will be kept synchronized with the GConf string list value pointed to by * @key. On calling this function @list_store will be populated with the @@ -1194,7 +1194,7 @@ gconf_bridge_unbind (GConfBridge *bridge, /* This will trigger the hash tables value destruction * function, which will take care of further cleanup */ - g_hash_table_remove (bridge->bindings, + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding_id)); } diff --git a/src/gconf-bridge.h b/src/gconf-bridge.h index ba67f4f..7edd247 100644 --- a/src/gconf-bridge.h +++ b/src/gconf-bridge.h @@ -1,4 +1,4 @@ -/* +/* * (C) 2005 OpenedHand Ltd. * * Author: Jorn Baayen <jorn@openedhand.com> @@ -81,7 +81,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, * @bridge: A #GConfBridge * @key_prefix: The prefix of the GConf keys * @window: A #GtkWindow - * + * * On calling this function @window will be resized to the values specified by * "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height". The respective * GConf values will be updated when the window is resized. See @@ -95,7 +95,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, * @bridge: A #GConfBridge * @key_prefix: The prefix of the GConf keys * @window: A #GtkWindow - * + * * On calling this function @window will be moved to the values specified by * "@key_prefix<!-- -->_x" and "@key_prefix<!-- -->_y". The respective GConf * values will be updated when the window is moved. See diff --git a/src/sj-about.c b/src/sj-about.c index 2b93fa3..af6ce17 100644 --- a/src/sj-about.c +++ b/src/sj-about.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003-2005 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-about.c @@ -33,7 +33,7 @@ G_MODULE_EXPORT void on_about_activate (void) { char *license_trans; - + const gchar *authors[] = { "Ross Burton <ross@burtonini.com>", "And many others who have contributed patches.", @@ -66,7 +66,7 @@ G_MODULE_EXPORT void on_about_activate (void) _(license[1]), "\n\n", _(license[2]), "\n\n", NULL); - + gtk_show_about_dialog (GTK_WINDOW (main_window), "comments", _("An Audio CD Extractor"), "version", VERSION, @@ -84,6 +84,6 @@ G_MODULE_EXPORT void on_about_activate (void) "wrap-license", TRUE, "website", "http://burtonini.com/blog/computers/sound-juicer", NULL); - + g_free (license_trans); } diff --git a/src/sj-about.h b/src/sj-about.h index 67ff1e0..07933f2 100644 --- a/src/sj-about.h +++ b/src/sj-about.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-about.h diff --git a/src/sj-extracting.c b/src/sj-extracting.c index 54041da..e8e7d4c 100644 --- a/src/sj-extracting.c +++ b/src/sj-extracting.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-extracting.c @@ -195,12 +195,12 @@ find_next (void) { do { gboolean extract = FALSE; - + gtk_tree_model_get (GTK_TREE_MODEL (track_store), ¤t, COLUMN_EXTRACT, &extract, -1); - + if (extract) return TRUE; - + } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (track_store), ¤t)); return FALSE; } @@ -235,26 +235,26 @@ cleanup (void) /* TODO: find out why GTK+ needs this to work (see #364371) */ gtk_button_set_label (GTK_BUTTON (extract_button), _("Extract")); gtk_button_set_label (GTK_BUTTON (extract_button), SJ_STOCK_EXTRACT); - + /* Clear the Status bar */ gtk_statusbar_push (GTK_STATUSBAR (status_bar), 0, ""); /* Clear the progress bar */ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 0); gtk_widget_hide (progress_bar); - + gtk_widget_set_sensitive (play_button, TRUE); gtk_widget_set_sensitive (title_entry, TRUE); gtk_widget_set_sensitive (artist_entry, TRUE); gtk_widget_set_sensitive (genre_entry, TRUE); gtk_widget_set_sensitive (year_entry, TRUE); gtk_widget_set_sensitive (disc_number_entry, TRUE); - /* Enabling the Menuitem */ + /* Enabling the Menuitem */ gtk_widget_set_sensitive (play_menuitem, TRUE); gtk_widget_set_sensitive (extract_menuitem, TRUE); gtk_widget_set_sensitive (reread_menuitem, TRUE); gtk_widget_set_sensitive (select_all_menuitem, TRUE); gtk_widget_set_sensitive (deselect_all_menuitem, TRUE); - + /*Enable the Extract column and Make the Title and Artist column Editable*/ g_object_set (G_OBJECT (toggle_renderer), "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL); g_object_set (G_OBJECT (title_renderer), "editable", TRUE, NULL); @@ -273,7 +273,7 @@ check_file_size (GFile *uri) GFileInfo *gfile_info; GError *error = NULL; goffset size; - + gfile_info = g_file_query_info (uri, G_FILE_ATTRIBUTE_STANDARD_SIZE, 0, NULL, &error); @@ -299,7 +299,7 @@ check_file_size (GFile *uri) static gboolean confirm_overwrite_existing_file (GFile *uri, int *overwrite_mode, goffset info_size) -{ +{ OverwriteDialogResponse ret; GtkWidget *dialog; GtkWidget *play_preview; @@ -461,13 +461,13 @@ pop_and_extract (int *overwrite_mode) /* Update the state stock image */ gtk_list_store_set (track_store, ¤t, COLUMN_STATE, STATE_EXTRACTING, -1); - + /* Update the progress bars */ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), CLAMP ((float)current_duration / (float)total_duration, 0.0, 1.0)); /* Set the Treelist focus to the item to be extracted */ - GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL (track_store), ¤t); + GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL (track_store), ¤t); gtk_tree_view_set_cursor(GTK_TREE_VIEW (track_listview), path, NULL, TRUE); gtk_tree_path_free(path); @@ -476,7 +476,7 @@ pop_and_extract (int *overwrite_mode) if (error) { goto error; } else - successful_extract = TRUE; + successful_extract = TRUE; goto local_cleanup; error: successful_extract = FALSE; @@ -518,11 +518,11 @@ update_speed_progress (SjExtractor *extractor, float speed, int eta) char *eta_str; if (eta >= 0) { - eta_str = g_strdup_printf (_("Estimated time left: %d:%02d (at %0.1f\303\227)"), eta / 60, eta % 60, speed); + eta_str = g_strdup_printf (_("Estimated time left: %d:%02d (at %0.1f\303\227)"), eta / 60, eta % 60, speed); } else { - eta_str = g_strdup (_("Estimated time left: unknown")); + eta_str = g_strdup (_("Estimated time left: unknown")); } - + gtk_statusbar_push (GTK_STATUSBAR (status_bar), 0, eta_str); g_free (eta_str); } @@ -549,7 +549,7 @@ on_progress_cb (SjExtractor *extractor, const int seconds, gpointer data) gettimeofday(&time, NULL); taken = time.tv_sec + (time.tv_usec / 1000000.0) - - (before.time.tv_sec + (before.time.tv_usec / 1000000.0)); + - (before.time.tv_sec + (before.time.tv_usec / 1000000.0)); if (taken >= 4) { before.taken += taken; before.ripped += current_duration + seconds - before.seconds; @@ -612,7 +612,7 @@ finished_actions (void) CA_PROP_EVENT_ID, "complete-media-rip", CA_PROP_EVENT_DESCRIPTION, _("CD rip complete"), NULL); - + /* Trigger glowing effect after copy */ g_signal_connect (G_OBJECT (main_window), "focus-in-event", G_CALLBACK (on_main_window_focus_in), NULL); @@ -622,7 +622,7 @@ finished_actions (void) if (eject_finished && successful_extract) { brasero_drive_eject (drive, FALSE, NULL); } - + /* Maybe open the target directory */ if (open_finished) { char *base = NULL; @@ -654,7 +654,7 @@ on_completion_cb (SjExtractor *extractor, gpointer data) /* Uncheck the Extract check box */ gtk_list_store_set (track_store, ¤t, COLUMN_EXTRACT, FALSE, -1); } - + gtk_tree_model_get (GTK_TREE_MODEL (track_store), ¤t, COLUMN_DETAILS, &track, -1); @@ -668,7 +668,7 @@ on_completion_cb (SjExtractor *extractor, gpointer data) g_object_unref (temp_file); g_object_unref (new_file); - + if (error) { on_error_cb (NULL, error, NULL); g_error_free (error); @@ -724,7 +724,7 @@ on_progress_cancel_clicked (GtkWidget *button, gpointer user_data) GError *error = NULL; sj_extractor_cancel_extract (extractor); - + gtk_tree_model_get (GTK_TREE_MODEL (track_store), ¤t, COLUMN_DETAILS, &track, -1); @@ -747,16 +747,16 @@ G_MODULE_EXPORT void on_extract_activate (GtkWidget *button, gpointer user_data) { char *reason; - + /* first make sure we're not playing, we cannot share the resource */ stop_playback (); - + /* If extracting, then cancel the extract */ if (extracting) { on_progress_cancel_clicked (NULL, NULL); return; } - + /* Populate the pending list */ current.stamp = 0; total_extracting = 0; @@ -788,22 +788,22 @@ on_extract_activate (GtkWidget *button, gpointer user_data) track_listview = GET_WIDGET ("track_listview"); progress_bar = GET_WIDGET ("progress_bar"); status_bar = GET_WIDGET ("status_bar"); - + play_menuitem = GET_WIDGET ("play_menuitem"); extract_menuitem = GET_WIDGET ("extract_menuitem"); reread_menuitem = GET_WIDGET ("re-read"); select_all_menuitem = GET_WIDGET ("select_all"); deselect_all_menuitem = GET_WIDGET ("deselect_all"); - + initialised = TRUE; } - + /* Change the label to Stop while extracting*/ /* TODO: find out why GTK+ needs this to work (see #364371) */ gtk_button_set_label (GTK_BUTTON (extract_button), _("Stop")); gtk_button_set_label (GTK_BUTTON (extract_button), GTK_STOCK_STOP); gtk_widget_show (progress_bar); - + /* Reset the progress dialog */ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), 0); update_speed_progress (NULL, 0.0, -1); @@ -816,13 +816,13 @@ on_extract_activate (GtkWidget *button, gpointer user_data) gtk_widget_set_sensitive (year_entry, FALSE); gtk_widget_set_sensitive (disc_number_entry, FALSE); - /* Disable the menuitems in the main menu*/ + /* Disable the menuitems in the main menu*/ gtk_widget_set_sensitive (play_menuitem, FALSE); gtk_widget_set_sensitive (extract_menuitem, FALSE); gtk_widget_set_sensitive (reread_menuitem, FALSE); gtk_widget_set_sensitive (select_all_menuitem, FALSE); gtk_widget_set_sensitive (deselect_all_menuitem, FALSE); - + /* Disable the Extract column */ g_object_set (G_OBJECT (toggle_renderer), "mode", GTK_CELL_RENDERER_MODE_INERT, NULL); g_object_set (G_OBJECT (title_renderer), "editable", FALSE, NULL); @@ -833,7 +833,7 @@ on_extract_activate (GtkWidget *button, gpointer user_data) g_warning ("Could not lock drive: %s", reason); g_free (reason); } - + cookie = sj_inhibit (g_get_application_name (), _("Extracting audio from CD"), GDK_WINDOW_XID(gtk_widget_get_window (main_window))); @@ -860,7 +860,7 @@ on_extract_activate (GtkWidget *button, gpointer user_data) * shell-friendly. This involves removing [?*\ ] and replacing with '_'. Also * any leading periods are removed so that the files don't end up being hidden. * - * This function doesn't change the input, and returns an allocated + * This function doesn't change the input, and returns an allocated * string. */ static char* @@ -872,11 +872,11 @@ sanitize_path (const char* str, const char* filesystem_type) /* Skip leading periods, otherwise files disappear... */ while (*str == '.') str++; - + s = g_strdup(str); /* Replace path seperators with a hyphen */ g_strdelimit (s, "/", '-'); - + /* filesystem specific sanitizing */ if (filesystem_type) { if ((strcmp (filesystem_type, "vfat") == 0) || @@ -884,7 +884,7 @@ sanitize_path (const char* str, const char* filesystem_type) g_strdelimit (s, "\\:*?\"<>|", ' '); } } - + if (strip_chars) { /* Replace separators with a hyphen */ g_strdelimit (s, "\\:|", '-'); @@ -932,7 +932,7 @@ filepath_parse_pattern (const char* pattern, const TrackDetails *track) if (pattern == NULL || pattern[0] == 0) return g_strdup (" "); - + fs_info = g_file_query_filesystem_info (base_uri, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE, NULL, NULL); if (fs_info) { @@ -977,7 +977,7 @@ filepath_parse_pattern (const char* pattern, const TrackDetails *track) break; case 'y': if (track->album->release_date && g_date_valid(track->album->release_date)) { - tmp = g_strdup_printf ("%d", g_date_get_year (track->album->release_date)); + tmp = g_strdup_printf ("%d", g_date_get_year (track->album->release_date)); string = sanitize_path (tmp, filesystem_type); g_free (tmp); } @@ -1084,7 +1084,7 @@ filepath_parse_pattern (const char* pattern, const TrackDetails *track) default: g_string_append (s, "%d"); p += 2; - + g_string_append_unichar (s, g_utf8_get_char (p)); p = g_utf8_next_char (p); go_next = FALSE; @@ -1106,8 +1106,8 @@ filepath_parse_pattern (const char* pattern, const TrackDetails *track) if (go_next) ++p; } - - g_free (filesystem_type); + + g_free (filesystem_type); str = s->str; g_string_free (s, FALSE); diff --git a/src/sj-extracting.h b/src/sj-extracting.h index 8dd343d..e8a7438 100644 --- a/src/sj-extracting.h +++ b/src/sj-extracting.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-extracting.h diff --git a/src/sj-genres.c b/src/sj-genres.c index 5dfbbfe..942fe97 100644 --- a/src/sj-genres.c +++ b/src/sj-genres.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007 Jonh Wendell <wendell@bani.com.br> * * Sound Juicer - sj-genres.c diff --git a/src/sj-genres.h b/src/sj-genres.h index ee9401f..32297a2 100644 --- a/src/sj-genres.h +++ b/src/sj-genres.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007 Jonh Wendell <wendell@bani.com.br> * * Sound Juicer - sj-genres.h diff --git a/src/sj-inhibit.c b/src/sj-inhibit.c index 6685af7..67582ae 100644 --- a/src/sj-inhibit.c +++ b/src/sj-inhibit.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> * Copyright (C) 2006-2007 Richard Hughes <richard@hughsie.com> * @@ -26,9 +26,9 @@ #endif #include <gio/gio.h> - + #include "sj-inhibit.h" - + /* PowerManagent defines */ #define PM_DBUS_SERVICE "org.gnome.SessionManager" #define PM_DBUS_INHIBIT_PATH "/org/gnome/SessionManager" diff --git a/src/sj-inhibit.h b/src/sj-inhibit.h index 3498cfe..3ea1b67 100644 --- a/src/sj-inhibit.h +++ b/src/sj-inhibit.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> * * Sound Juicer - sj-inhibit.h @@ -24,7 +24,7 @@ #define SJ_INHIBIT_H #include <glib.h> - + guint sj_inhibit (const gchar * appname, const gchar * reason, guint xid); void sj_uninhibit (guint cookie); diff --git a/src/sj-main.h b/src/sj-main.h index 9f3e971..8a5d835 100644 --- a/src/sj-main.h +++ b/src/sj-main.h @@ -1,4 +1,4 @@ -/* +/* * Sound Juicer - sj-main.h * * This program is free software; you can redistribute it and/or modify diff --git a/src/sj-play.c b/src/sj-play.c index cdb9731..676e556 100644 --- a/src/sj-play.c +++ b/src/sj-play.c @@ -85,7 +85,7 @@ static void _play (void) { gst_element_set_state (pipeline, GST_STATE_PLAYING); - + gtk_widget_set_sensitive (next_menuitem, TRUE); gtk_widget_set_sensitive (prev_menuitem, TRUE); } @@ -191,7 +191,7 @@ cb_error (GstBus *bus, GstMessage *message, gpointer user_data) error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - + g_error_free (error); /* There may be other (more generic) error messages on the bus; set pipeline @@ -337,7 +337,7 @@ setup (GError **err) /* TODO: * replace with playbin. Tim says: - * + * * just create playbin and your audio sink, then do g_object_set (playbin, * "audio-sink", audiosink, NULL); and set cdda://<track-number> as URI on * playbin and set it to PLAYING. and then go @@ -413,7 +413,7 @@ setup (GError **err) if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (track_store), ¤t_iter)) g_warning ("Cannot get first iter"); } - + return TRUE; } @@ -440,7 +440,7 @@ on_play_activate (GtkWidget *button, gpointer user_data) _pause (); gtk_list_store_set (track_store, ¤t_iter, COLUMN_STATE, STATE_PAUSED, -1); - } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED && + } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED && current_track == seek_to_track) { _play (); gtk_list_store_set (track_store, ¤t_iter, @@ -583,7 +583,7 @@ on_volume_changed (GtkWidget * volb, gdouble value, gpointer data) volume = gst_bin_get_by_name_recurse_up (GST_BIN (pipeline), "vol"); g_object_set (G_OBJECT (volume), "volume", vol, NULL); - } + } gconf_client_set_float (gconf_client, GCONF_AUDIO_VOLUME, vol, NULL); } diff --git a/src/sj-play.h b/src/sj-play.h index ce3ddd0..d5b65f8 100644 --- a/src/sj-play.h +++ b/src/sj-play.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-play.h diff --git a/src/sj-prefs.c b/src/sj-prefs.c index b1ef97f..0485f20 100644 --- a/src/sj-prefs.c +++ b/src/sj-prefs.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-about.c @@ -125,14 +125,14 @@ void show_help (GtkWindow *parent) G_MODULE_EXPORT void prefs_base_folder_changed (GtkWidget *chooser, gpointer user_data) { char *new_uri, *current_uri; - + current_uri = gconf_client_get_string (gconf_client, GCONF_BASEURI, NULL); - new_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)); + new_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)); if (current_uri == NULL || strcmp(current_uri, new_uri) != 0) { gconf_client_set_string (gconf_client, GCONF_BASEURI, new_uri, NULL); } - + g_free (new_uri); g_free (current_uri); } @@ -230,9 +230,9 @@ static void baseuri_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry * } else { g_return_if_fail (entry->value->type == GCONF_VALUE_STRING); current_uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (basepath_fcb)); - if (current_uri == NULL || strcmp (current_uri, base_uri) != 0) + if (current_uri == NULL || strcmp (current_uri, base_uri) != 0) gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (basepath_fcb), base_uri); - + } } @@ -265,7 +265,7 @@ static void pattern_label_update (void) NULL, /* track ID */ NULL, /* artist ID */ }; - + g_object_get (extractor, "profile", &profile, NULL); /* It's possible the profile isn't set, in which case do nothing */ if (!profile) { @@ -302,7 +302,7 @@ static void pattern_label_update (void) "</i></small>", NULL); g_free (example); g_free (media_type); - + gtk_label_set_markup (GTK_LABEL (path_example_label), format); g_free (format); } @@ -331,9 +331,9 @@ static void file_pattern_changed_cb (GConfClient *client, guint cnxn_id, GConfEn { char *value; int i = 0; - + g_return_if_fail (strcmp (entry->key, GCONF_FILE_PATTERN) == 0); - + if (entry->value == NULL) { value = g_strdup (file_patterns[0].pattern); } else if (entry->value->type == GCONF_VALUE_STRING) { @@ -403,7 +403,7 @@ static void populate_pattern_combo (GtkComboBox *combo, const FilePattern *patte { GtkListStore *store; int i; - + store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); for (i = 0; patterns[i].pattern; ++i) { GtkTreeIter iter; diff --git a/src/sj-prefs.h b/src/sj-prefs.h index fe8cc1a..70a4165 100644 --- a/src/sj-prefs.h +++ b/src/sj-prefs.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sj-prefs.h diff --git a/src/sound-juicer.h b/src/sound-juicer.h index 110f25c..3560df2 100644 --- a/src/sound-juicer.h +++ b/src/sound-juicer.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Ross Burton <ross@burtonini.com> * * Sound Juicer - sound-juicer.h |