[rhythmbox] remove 'impl_' from all RBSource method names
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] remove 'impl_' from all RBSource method names
- Date: Mon, 29 Sep 2014 22:21:07 +0000 (UTC)
commit bb6a991a077283fd6975f0d3ba3c45301e4926f6
Author: Jonathan Matthew <jonathan d14n org>
Date: Mon Sep 8 09:18:31 2014 +1000
remove 'impl_' from all RBSource method names
Annoying API break, but this is necessary to improve introspection.
The method pointers in the class struct must match the invoker functions
for any of the invoker annotations to apply to the method too.
plugins/audiocd/rb-audiocd-source.c | 16 +-
.../rb-audioscrobbler-radio-source.c | 16 +-
plugins/daap/rb-daap-source.c | 6 +-
plugins/fmradio/rb-fm-radio-source.c | 14 +-
.../rb-generic-player-playlist-source.c | 6 +-
plugins/generic-player/rb-generic-player-source.c | 54 ++++----
plugins/generic-player/rb-generic-player-source.h | 12 +-
plugins/generic-player/rb-nokia770-source.c | 2 +-
plugins/generic-player/rb-psp-source.c | 2 +-
plugins/grilo/rb-grilo-source.c | 2 +-
plugins/ipod/rb-ipod-source.c | 32 +++---
plugins/ipod/rb-ipod-static-playlist-source.c | 4 +-
plugins/iradio/rb-iradio-source.c | 24 ++--
plugins/magnatune/MagnatuneSource.py | 2 +-
plugins/mtpdevice/rb-mtp-source.c | 32 +++---
podcast/rb-podcast-main-source.c | 4 +-
podcast/rb-podcast-source.c | 24 ++--
shell/rb-play-order.c | 16 ---
shell/rb-shell-clipboard.c | 2 +-
sources/rb-auto-playlist-source.c | 10 +-
sources/rb-browser-source.c | 24 ++--
sources/rb-device-source.c | 4 +-
sources/rb-import-errors-source.c | 24 ++--
sources/rb-library-source.c | 10 +-
sources/rb-media-player-source.c | 42 +++---
sources/rb-media-player-source.h | 14 +-
sources/rb-missing-files-source.c | 26 ++--
sources/rb-play-queue-source.c | 10 +-
sources/rb-playlist-source.c | 30 ++--
sources/rb-playlist-source.h | 6 +-
sources/rb-source.c | 135 +++++++------------
sources/rb-source.h | 54 ++++----
sources/rb-static-playlist-source.c | 26 ++--
sources/rb-streaming-source.c | 10 +-
34 files changed, 322 insertions(+), 373 deletions(-)
---
diff --git a/plugins/audiocd/rb-audiocd-source.c b/plugins/audiocd/rb-audiocd-source.c
index 32c1016..597cc1e 100644
--- a/plugins/audiocd/rb-audiocd-source.c
+++ b/plugins/audiocd/rb-audiocd-source.c
@@ -190,14 +190,14 @@ rb_audiocd_source_class_init (RBAudioCdSourceClass *klass)
page_class->delete_thyself = impl_delete_thyself;
- source_class->impl_can_paste = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
-
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_uri_is_source = impl_uri_is_source;
- source_class->impl_try_playlist = (RBSourceFeatureFunc) rb_true_function; /* shouldn't need
this. */
- source_class->impl_want_uri = impl_want_uri;
+ source_class->can_paste = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->uri_is_source = impl_uri_is_source;
+ source_class->try_playlist = (RBSourceFeatureFunc) rb_true_function; /* shouldn't need this. */
+ source_class->want_uri = impl_want_uri;
g_object_class_install_property (object_class,
PROP_VOLUME,
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
index acd1c3c..af7543f 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
@@ -304,14 +304,14 @@ rb_audioscrobbler_radio_source_class_init (RBAudioscrobblerRadioSourceClass *kla
page_class->remove = impl_remove;
source_class = RB_SOURCE_CLASS (klass);
- source_class->impl_can_rename = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_pause = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_try_playlist = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_handle_eos = impl_handle_eos;
- source_class->impl_get_playback_status = impl_get_playback_status;
+ source_class->can_rename = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_pause = (RBSourceFeatureFunc) rb_false_function;
+ source_class->try_playlist = (RBSourceFeatureFunc) rb_false_function;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->handle_eos = impl_handle_eos;
+ source_class->get_playback_status = impl_get_playback_status;
g_object_class_install_property (object_class,
PROP_PARENT,
diff --git a/plugins/daap/rb-daap-source.c b/plugins/daap/rb-daap-source.c
index 4814413..4bc81cb 100644
--- a/plugins/daap/rb-daap-source.c
+++ b/plugins/daap/rb-daap-source.c
@@ -180,9 +180,9 @@ rb_daap_source_class_init (RBDAAPSourceClass *klass)
page_class->selected = rb_daap_source_selected;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_false_function;
browser_source_class->has_drop_support = (RBBrowserSourceFeatureFunc) rb_false_function;
diff --git a/plugins/fmradio/rb-fm-radio-source.c b/plugins/fmradio/rb-fm-radio-source.c
index 14bdba0..260d02e 100644
--- a/plugins/fmradio/rb-fm-radio-source.c
+++ b/plugins/fmradio/rb-fm-radio-source.c
@@ -67,7 +67,7 @@ static void new_station_action_cb (GSimpleAction *action, GVariant *parameter, g
static void playing_entry_changed (RBShellPlayer *player, RhythmDBEntry *entry,
RBFMRadioSource *self);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static RBEntryView *impl_get_entry_view (RBSource *source);
static void rb_fm_radio_entry_type_class_init (RBFMRadioEntryTypeClass *klass);
@@ -125,11 +125,11 @@ rb_fm_radio_source_class_init (RBFMRadioSourceClass *class)
object_class->constructed = rb_fm_radio_source_constructed;
object_class->dispose = rb_fm_radio_source_dispose;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_pause = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_delete = impl_delete;
- source_class->impl_get_entry_view = impl_get_entry_view;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_pause = (RBSourceFeatureFunc) rb_false_function;
+ source_class->delete_selected = impl_delete_selected;
+ source_class->get_entry_view = impl_get_entry_view;
g_type_class_add_private (class, sizeof (RBFMRadioSourcePrivate));
}
@@ -451,7 +451,7 @@ playing_entry_changed (RBShellPlayer *player, RhythmDBEntry *entry,
}
static void
-impl_delete (RBSource *source)
+impl_delete_selected (RBSource *source)
{
RBFMRadioSource *self = RB_FM_RADIO_SOURCE (source);
GList *selection, *tmp;
diff --git a/plugins/generic-player/rb-generic-player-playlist-source.c
b/plugins/generic-player/rb-generic-player-playlist-source.c
index 4af8b86..a66d1e4 100644
--- a/plugins/generic-player/rb-generic-player-playlist-source.c
+++ b/plugins/generic-player/rb-generic-player-playlist-source.c
@@ -531,10 +531,10 @@ rb_generic_player_playlist_source_class_init (RBGenericPlayerPlaylistSourceClass
page_class->can_remove = impl_can_remove;
page_class->remove = impl_remove;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- playlist_class->impl_save_contents_to_xml = impl_save_to_xml;
- playlist_class->impl_mark_dirty = impl_mark_dirty;
+ playlist_class->save_contents_to_xml = impl_save_to_xml;
+ playlist_class->mark_dirty = impl_mark_dirty;
g_object_class_install_property (object_class,
PROP_PLAYER_SOURCE,
diff --git a/plugins/generic-player/rb-generic-player-source.c
b/plugins/generic-player/rb-generic-player-source.c
index 7d7dfbf..a71d097 100644
--- a/plugins/generic-player/rb-generic-player-source.c
+++ b/plugins/generic-player/rb-generic-player-source.c
@@ -81,7 +81,7 @@ static void impl_selected (RBDisplayPage *page);
static gboolean impl_can_paste (RBSource *source);
static RBTrackTransferBatch *impl_paste (RBSource *source, GList *entries);
static gboolean impl_can_delete (RBSource *source);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static void impl_eject (RBDeviceSource *source);
@@ -175,26 +175,26 @@ rb_generic_player_source_class_init (RBGenericPlayerSourceClass *klass)
page_class->delete_thyself = impl_delete_thyself;
page_class->selected = impl_selected;
- source_class->impl_can_delete = impl_can_delete;
- source_class->impl_delete = impl_delete;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_paste = impl_can_paste;
- source_class->impl_paste = impl_paste;
- source_class->impl_want_uri = rb_device_source_want_uri;
- source_class->impl_uri_is_source = rb_device_source_uri_is_source;
-
- mps_class->impl_get_entries = impl_get_entries;
- mps_class->impl_get_capacity = impl_get_capacity;
- mps_class->impl_get_free_space = impl_get_free_space;
- mps_class->impl_delete_entries = impl_delete_entries;
- mps_class->impl_show_properties = impl_show_properties;
- mps_class->impl_add_playlist = impl_add_playlist;
- mps_class->impl_remove_playlists = impl_remove_playlists;
-
- klass->impl_get_mount_path = default_get_mount_path;
- klass->impl_load_playlists = default_load_playlists;
- klass->impl_uri_from_playlist_uri = default_uri_from_playlist_uri;
- klass->impl_uri_to_playlist_uri = default_uri_to_playlist_uri;
+ source_class->can_delete = impl_can_delete;
+ source_class->delete_selected = impl_delete_selected;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_paste = impl_can_paste;
+ source_class->paste = impl_paste;
+ source_class->want_uri = rb_device_source_want_uri;
+ source_class->uri_is_source = rb_device_source_uri_is_source;
+
+ mps_class->get_entries = impl_get_entries;
+ mps_class->get_capacity = impl_get_capacity;
+ mps_class->get_free_space = impl_get_free_space;
+ mps_class->delete_entries = impl_delete_entries;
+ mps_class->show_properties = impl_show_properties;
+ mps_class->add_playlist = impl_add_playlist;
+ mps_class->remove_playlists = impl_remove_playlists;
+
+ klass->get_mount_path = default_get_mount_path;
+ klass->load_playlists = default_load_playlists;
+ klass->uri_from_playlist_uri = default_uri_from_playlist_uri;
+ klass->uri_to_playlist_uri = default_uri_to_playlist_uri;
g_object_class_install_property (object_class,
PROP_ERROR_ENTRY_TYPE,
@@ -605,8 +605,8 @@ import_complete_cb (RhythmDBImportJob *job, int total, RBGenericPlayerSource *so
rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (priv->import_errors), RB_DISPLAY_PAGE
(source));
g_object_unref (shell);
- if (klass->impl_load_playlists)
- klass->impl_load_playlists (source);
+ if (klass->load_playlists)
+ klass->load_playlists (source);
g_object_set (source, "load-status", RB_SOURCE_LOAD_STATUS_LOADED, NULL);
@@ -677,7 +677,7 @@ rb_generic_player_source_get_mount_path (RBGenericPlayerSource *source)
{
RBGenericPlayerSourceClass *klass = RB_GENERIC_PLAYER_SOURCE_GET_CLASS (source);
- return klass->impl_get_mount_path (source);
+ return klass->get_mount_path (source);
}
static char *
@@ -801,7 +801,7 @@ rb_generic_player_source_uri_from_playlist_uri (RBGenericPlayerSource *source, c
{
RBGenericPlayerSourceClass *klass = RB_GENERIC_PLAYER_SOURCE_GET_CLASS (source);
- return klass->impl_uri_from_playlist_uri (source, uri);
+ return klass->uri_from_playlist_uri (source, uri);
}
char *
@@ -809,7 +809,7 @@ rb_generic_player_source_uri_to_playlist_uri (RBGenericPlayerSource *source, con
{
RBGenericPlayerSourceClass *klass = RB_GENERIC_PLAYER_SOURCE_GET_CLASS (source);
- return klass->impl_uri_to_playlist_uri (source, uri, playlist_type);
+ return klass->uri_to_playlist_uri (source, uri, playlist_type);
}
static void
@@ -1072,7 +1072,7 @@ rb_generic_player_source_delete_entries (RBGenericPlayerSource *source, GList *e
}
static void
-impl_delete (RBSource *source)
+impl_delete_selected (RBSource *source)
{
RBEntryView *view;
GList *sel;
diff --git a/plugins/generic-player/rb-generic-player-source.h
b/plugins/generic-player/rb-generic-player-source.h
index 7e8427f..014275d 100644
--- a/plugins/generic-player/rb-generic-player-source.h
+++ b/plugins/generic-player/rb-generic-player-source.h
@@ -54,15 +54,15 @@ typedef struct
{
RBMediaPlayerSourceClass parent;
- char * (*impl_get_mount_path) (RBGenericPlayerSource *source);
- void (*impl_load_playlists) (RBGenericPlayerSource *source);
- char ** (*impl_get_audio_folders) (RBGenericPlayerSource *source);
+ char * (*get_mount_path) (RBGenericPlayerSource *source);
+ void (*load_playlists) (RBGenericPlayerSource *source);
+ char ** (*get_audio_folders) (RBGenericPlayerSource *source);
- char * (*impl_uri_from_playlist_uri) (RBGenericPlayerSource *source, const char *uri);
- char * (*impl_uri_to_playlist_uri) (RBGenericPlayerSource *source, const char *uri,
TotemPlParserType playlist_type);
+ char * (*uri_from_playlist_uri) (RBGenericPlayerSource *source, const char *uri);
+ char * (*uri_to_playlist_uri) (RBGenericPlayerSource *source, const char *uri,
TotemPlParserType playlist_type);
/* used for track transfer - returns the filename relative to the audio folder on the device */
- char * (*impl_build_filename) (RBGenericPlayerSource *source, RhythmDBEntry *entry);
+ char * (*build_filename) (RBGenericPlayerSource *source, RhythmDBEntry *entry);
} RBGenericPlayerSourceClass;
RBSource * rb_generic_player_source_new (GObject *plugin,
diff --git a/plugins/generic-player/rb-nokia770-source.c b/plugins/generic-player/rb-nokia770-source.c
index 447c8cf..abe771a 100644
--- a/plugins/generic-player/rb-nokia770-source.c
+++ b/plugins/generic-player/rb-nokia770-source.c
@@ -55,7 +55,7 @@ rb_nokia770_source_class_init (RBNokia770SourceClass *klass)
{
RBGenericPlayerSourceClass *generic_class = RB_GENERIC_PLAYER_SOURCE_CLASS (klass);
- generic_class->impl_uri_from_playlist_uri = impl_uri_from_playlist_uri;
+ generic_class->uri_from_playlist_uri = impl_uri_from_playlist_uri;
}
static void
diff --git a/plugins/generic-player/rb-psp-source.c b/plugins/generic-player/rb-psp-source.c
index 28c896b..f4bd05d 100644
--- a/plugins/generic-player/rb-psp-source.c
+++ b/plugins/generic-player/rb-psp-source.c
@@ -54,7 +54,7 @@ static void
rb_psp_source_class_init (RBPspSourceClass *klass)
{
RBGenericPlayerSourceClass *generic_class = RB_GENERIC_PLAYER_SOURCE_CLASS (klass);
- generic_class->impl_load_playlists = rb_psp_source_create_playlists;
+ generic_class->load_playlists = rb_psp_source_create_playlists;
}
static void
diff --git a/plugins/grilo/rb-grilo-source.c b/plugins/grilo/rb-grilo-source.c
index c13a305..9aae67e 100644
--- a/plugins/grilo/rb-grilo-source.c
+++ b/plugins/grilo/rb-grilo-source.c
@@ -186,7 +186,7 @@ rb_grilo_source_class_init (RBGriloSourceClass *klass)
page_class->selected = impl_selected;
page_class->deselected = impl_deselected;
- source_class->impl_get_entry_view = impl_get_entry_view;
+ source_class->get_entry_view = impl_get_entry_view;
g_object_class_install_property (object_class,
PROP_GRILO_SOURCE,
diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
index 5c17585..d487e60 100644
--- a/plugins/ipod/rb-ipod-source.c
+++ b/plugins/ipod/rb-ipod-source.c
@@ -67,7 +67,7 @@ static void rb_ipod_source_constructed (GObject *object);
static void rb_ipod_source_dispose (GObject *object);
static void rb_ipod_source_finalize (GObject *object);
-static void impl_delete (RBSource *asource);
+static void impl_delete_selected (RBSource *asource);
static RBTrackTransferBatch *impl_paste (RBSource *source, GList *entries);
static void rb_ipod_load_songs (RBiPodSource *source);
@@ -186,22 +186,22 @@ rb_ipod_source_class_init (RBiPodSourceClass *klass)
page_class->delete_thyself = impl_delete_thyself;
page_class->selected = impl_selected;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_delete = impl_delete;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->delete_selected = impl_delete_selected;
- source_class->impl_can_paste = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_paste = impl_paste;
- source_class->impl_want_uri = rb_device_source_want_uri;
- source_class->impl_uri_is_source = rb_device_source_uri_is_source;
+ source_class->can_paste = (RBSourceFeatureFunc) rb_true_function;
+ source_class->paste = impl_paste;
+ source_class->want_uri = rb_device_source_want_uri;
+ source_class->uri_is_source = rb_device_source_uri_is_source;
- mps_class->impl_get_entries = impl_get_entries;
- mps_class->impl_get_capacity = impl_get_capacity;
- mps_class->impl_get_free_space = impl_get_free_space;
- mps_class->impl_delete_entries = impl_delete_entries;
- mps_class->impl_add_playlist = impl_add_playlist;
- mps_class->impl_remove_playlists = impl_remove_playlists;
- mps_class->impl_show_properties = impl_show_properties;
+ mps_class->get_entries = impl_get_entries;
+ mps_class->get_capacity = impl_get_capacity;
+ mps_class->get_free_space = impl_get_free_space;
+ mps_class->delete_entries = impl_delete_entries;
+ mps_class->add_playlist = impl_add_playlist;
+ mps_class->remove_playlists = impl_remove_playlists;
+ mps_class->show_properties = impl_show_properties;
g_object_class_install_property (object_class,
PROP_DEVICE_INFO,
@@ -1378,7 +1378,7 @@ impl_paste (RBSource *source, GList *entries)
}
static void
-impl_delete (RBSource *source)
+impl_delete_selected (RBSource *source)
{
GList *sel;
RBEntryView *songs;
diff --git a/plugins/ipod/rb-ipod-static-playlist-source.c b/plugins/ipod/rb-ipod-static-playlist-source.c
index 653fb85..e9e5bb0 100644
--- a/plugins/ipod/rb-ipod-static-playlist-source.c
+++ b/plugins/ipod/rb-ipod-static-playlist-source.c
@@ -251,8 +251,8 @@ rb_ipod_static_playlist_source_class_init (RBIpodStaticPlaylistSourceClass *klas
page_class->can_remove = impl_can_remove;
page_class->remove = impl_remove;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
/* Don't override impl_delete here -- it's provided by RBStaticPlaylistSource */
diff --git a/plugins/iradio/rb-iradio-source.c b/plugins/iradio/rb-iradio-source.c
index 5a35ecd..2af91e8 100644
--- a/plugins/iradio/rb-iradio-source.c
+++ b/plugins/iradio/rb-iradio-source.c
@@ -91,7 +91,7 @@ static void impl_get_status (RBDisplayPage *page, char **text, char **progress_t
/* source methods */
static RBEntryView *impl_get_entry_view (RBSource *source);
static void impl_search (RBSource *source, RBSourceSearch *search, const char *cur_text, const char
*new_text);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static void impl_song_properties (RBSource *source);
static guint impl_want_uri (RBSource *source, const char *uri);
static void impl_add_uri (RBSource *source,
@@ -193,16 +193,16 @@ rb_iradio_source_class_init (RBIRadioSourceClass *klass)
page_class->get_status = impl_get_status;
source_class->reset_filters = impl_reset_filters;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_pause = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_delete = impl_delete;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_search = impl_search;
- source_class->impl_song_properties = impl_song_properties;
- source_class->impl_want_uri = impl_want_uri;
- source_class->impl_add_uri = impl_add_uri;
- source_class->impl_get_playback_status = impl_get_playback_status;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_pause = (RBSourceFeatureFunc) rb_false_function;
+ source_class->delete_selected = impl_delete_selected;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->search = impl_search;
+ source_class->song_properties = impl_song_properties;
+ source_class->want_uri = impl_want_uri;
+ source_class->add_uri = impl_add_uri;
+ source_class->get_playback_status = impl_get_playback_status;
g_object_class_override_property (object_class,
PROP_SHOW_BROWSER,
@@ -612,7 +612,7 @@ impl_get_playback_status (RBSource *source, char **text, float *progress)
}
static void
-impl_delete (RBSource *asource)
+impl_delete_selected (RBSource *asource)
{
RBIRadioSource *source = RB_IRADIO_SOURCE (asource);
GList *sel;
diff --git a/plugins/magnatune/MagnatuneSource.py b/plugins/magnatune/MagnatuneSource.py
index 327d0a6..3182e74 100644
--- a/plugins/magnatune/MagnatuneSource.py
+++ b/plugins/magnatune/MagnatuneSource.py
@@ -126,7 +126,7 @@ class MagnatuneSource(RB.BrowserSource):
self.__update_id = GLib.timeout_add_seconds(6 * 60 * 60, self.__update_catalogue)
self.__update_catalogue()
- def do_impl_can_delete(self):
+ def do_can_delete(self):
return False
def do_pack_content(self, content):
diff --git a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c
index 4703c13..61e34dd 100644
--- a/plugins/mtpdevice/rb-mtp-source.c
+++ b/plugins/mtpdevice/rb-mtp-source.c
@@ -75,7 +75,7 @@ static void rb_mtp_source_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
-static void impl_delete (RBSource *asource);
+static void impl_delete_selected (RBSource *asource);
static RBTrackTransferBatch *impl_paste (RBSource *asource, GList *entries);
static gboolean impl_uri_is_source (RBSource *asource, const char *uri);
@@ -189,20 +189,20 @@ rb_mtp_source_class_init (RBMtpSourceClass *klass)
page_class->selected = impl_selected;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_paste = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_delete = impl_delete;
- source_class->impl_paste = impl_paste;
- source_class->impl_uri_is_source = impl_uri_is_source;
-
- mps_class->impl_get_entries = impl_get_entries;
- mps_class->impl_get_capacity = impl_get_capacity;
- mps_class->impl_get_free_space = impl_get_free_space;
- mps_class->impl_delete_entries = impl_delete_entries;
- mps_class->impl_show_properties = impl_show_properties;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_paste = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->delete_selected = impl_delete_selected;
+ source_class->paste = impl_paste;
+ source_class->uri_is_source = impl_uri_is_source;
+
+ mps_class->get_entries = impl_get_entries;
+ mps_class->get_capacity = impl_get_capacity;
+ mps_class->get_free_space = impl_get_free_space;
+ mps_class->delete_entries = impl_delete_entries;
+ mps_class->show_properties = impl_show_properties;
g_object_class_install_property (object_class,
PROP_RAW_DEVICE,
@@ -1044,7 +1044,7 @@ media_type_to_filetype (RBMtpSource *source, const char *media_type)
}
static void
-impl_delete (RBSource *source)
+impl_delete_selected (RBSource *source)
{
GList *sel;
RBEntryView *songs;
diff --git a/podcast/rb-podcast-main-source.c b/podcast/rb-podcast-main-source.c
index b583087..d59d85f 100644
--- a/podcast/rb-podcast-main-source.c
+++ b/podcast/rb-podcast-main-source.c
@@ -421,8 +421,8 @@ rb_podcast_main_source_class_init (RBPodcastMainSourceClass *klass)
page_class->get_config_widget = impl_get_config_widget;
- source_class->impl_want_uri = impl_want_uri;
- source_class->impl_add_uri = impl_add_uri;
+ source_class->want_uri = impl_want_uri;
+ source_class->add_uri = impl_add_uri;
g_type_class_add_private (klass, sizeof (RBPodcastMainSourcePrivate));
}
diff --git a/podcast/rb-podcast-source.c b/podcast/rb-podcast-source.c
index 7a7dabb..3b5fc83 100644
--- a/podcast/rb-podcast-source.c
+++ b/podcast/rb-podcast-source.c
@@ -1101,7 +1101,7 @@ delete_response_cb (GtkDialog *dialog, int response, RBPodcastSource *source)
}
static void
-impl_delete (RBSource *asource)
+impl_delete_selected (RBSource *asource)
{
RBPodcastSource *source = RB_PODCAST_SOURCE (asource);
GtkWidget *dialog;
@@ -1680,17 +1680,17 @@ rb_podcast_source_class_init (RBPodcastSourceClass *klass)
page_class->receive_drag = impl_receive_drag;
source_class->reset_filters = impl_reset_filters;
- source_class->impl_add_to_queue = impl_add_to_queue;
- source_class->impl_can_add_to_queue = impl_can_add_to_queue;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_delete = impl_delete;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_handle_eos = impl_handle_eos;
- source_class->impl_search = impl_search;
- source_class->impl_song_properties = impl_song_properties;
- source_class->impl_get_delete_label = impl_get_delete_label;
+ source_class->add_to_queue = impl_add_to_queue;
+ source_class->can_add_to_queue = impl_can_add_to_queue;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->delete_selected = impl_delete_selected;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->handle_eos = impl_handle_eos;
+ source_class->search = impl_search;
+ source_class->song_properties = impl_song_properties;
+ source_class->get_delete_label = impl_get_delete_label;
g_object_class_install_property (object_class,
PROP_PODCAST_MANAGER,
diff --git a/shell/rb-play-order.c b/shell/rb-play-order.c
index 6ede345..7a2a076 100644
--- a/shell/rb-play-order.c
+++ b/shell/rb-play-order.c
@@ -876,19 +876,3 @@ rb_play_order_update_have_next_previous (RBPlayOrder *porder)
porder->priv->have_previous = have_previous;
}
}
-
-/* annotations for methods */
-
-/**
- * get_next:
- * @porder: the play order
- *
- * Return value: (transfer full): the next entry
- */
-
-/**
- * get_previous:
- * @porder: the play order
- *
- * Return value: (transfer full): the previous entry
- */
diff --git a/shell/rb-shell-clipboard.c b/shell/rb-shell-clipboard.c
index 4252ca2..725135d 100644
--- a/shell/rb-shell-clipboard.c
+++ b/shell/rb-shell-clipboard.c
@@ -628,7 +628,7 @@ static void
delete_action_cb (GSimpleAction *action, GVariant *parameters, gpointer data)
{
RBShellClipboard *clipboard = RB_SHELL_CLIPBOARD (data);
- rb_source_delete (clipboard->priv->source);
+ rb_source_delete_selected (clipboard->priv->source);
}
static void
diff --git a/sources/rb-auto-playlist-source.c b/sources/rb-auto-playlist-source.c
index 38c429e..0d84f92 100644
--- a/sources/rb-auto-playlist-source.c
+++ b/sources/rb-auto-playlist-source.c
@@ -148,12 +148,12 @@ rb_auto_playlist_source_class_init (RBAutoPlaylistSourceClass *klass)
page_class->receive_drag = impl_receive_drag;
source_class->reset_filters = impl_reset_filters;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_search = impl_search;
- source_class->impl_get_property_views = impl_get_property_views;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_false_function;
+ source_class->search = impl_search;
+ source_class->get_property_views = impl_get_property_views;
- playlist_class->impl_save_contents_to_xml = impl_save_contents_to_xml;
+ playlist_class->save_contents_to_xml = impl_save_contents_to_xml;
g_object_class_override_property (object_class, PROP_BASE_QUERY_MODEL, "base-query-model");
g_object_class_override_property (object_class, PROP_SHOW_BROWSER, "show-browser");
diff --git a/sources/rb-browser-source.c b/sources/rb-browser-source.c
index 36bc34c..bf775e9 100644
--- a/sources/rb-browser-source.c
+++ b/sources/rb-browser-source.c
@@ -90,7 +90,7 @@ static void rb_browser_source_browser_changed_cb (RBLibraryBrowser *entry,
/* source methods */
static RBEntryView *impl_get_entry_view (RBSource *source);
static GList *impl_get_property_views (RBSource *source);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static void impl_search (RBSource *source, RBSourceSearch *search, const char *cur_text, const char
*new_text);
static void impl_reset_filters (RBSource *source);
static void impl_song_properties (RBSource *source);
@@ -161,16 +161,16 @@ rb_browser_source_class_init (RBBrowserSourceClass *klass)
object_class->get_property = rb_browser_source_get_property;
source_class->reset_filters = impl_reset_filters;
- source_class->impl_search = impl_search;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_get_property_views = impl_get_property_views;
- source_class->impl_song_properties = impl_song_properties;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_add_to_queue = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_delete = impl_delete;
+ source_class->search = impl_search;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->get_property_views = impl_get_property_views;
+ source_class->song_properties = impl_song_properties;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_add_to_queue = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
+ source_class->delete_selected = impl_delete_selected;
klass->pack_content = default_pack_content;
klass->has_drop_support = (RBBrowserSourceFeatureFunc) rb_false_function;
@@ -643,7 +643,7 @@ impl_reset_filters (RBSource *asource)
}
static void
-impl_delete (RBSource *asource)
+impl_delete_selected (RBSource *asource)
{
RBBrowserSource *source = RB_BROWSER_SOURCE (asource);
GList *sel, *tem;
diff --git a/sources/rb-device-source.c b/sources/rb-device-source.c
index 88dc2db..5d4fc0d 100644
--- a/sources/rb-device-source.c
+++ b/sources/rb-device-source.c
@@ -235,7 +235,7 @@ rb_device_source_eject (RBDeviceSource *source)
*
* Checks whether @uri identifies a path underneath the
* device's mount point. Should be used to implement
- * the #RBSource impl_want_uri method.
+ * the #RBSource want_uri method.
*
* Return value: URI match strength
*/
@@ -314,7 +314,7 @@ rb_device_source_want_uri (RBSource *source, const char *uri)
* @uri: a URI to check
*
* Returns %TRUE if @uri matches @source. This should be
- * used to implement the impl_uri_is_source #RBSource method.
+ * used to implement the uri_is_source #RBSource method.
*
* Return value: %TRUE if @uri matches @source
*/
diff --git a/sources/rb-import-errors-source.c b/sources/rb-import-errors-source.c
index 8beae22..9513983 100644
--- a/sources/rb-import-errors-source.c
+++ b/sources/rb-import-errors-source.c
@@ -46,7 +46,7 @@ static void impl_get_property (GObject *object, guint prop_id, GValue *value, GP
static void impl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static RBEntryView *impl_get_entry_view (RBSource *source);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static void impl_get_status (RBDisplayPage *page, char **text, char **progress_text, float *progress);
static void rb_import_errors_source_songs_show_popup_cb (RBEntryView *view,
@@ -121,19 +121,19 @@ rb_import_errors_source_class_init (RBImportErrorsSourceClass *klass)
page_class->get_status = impl_get_status;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_can_rename = (RBSourceFeatureFunc) rb_false_function;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->can_rename = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_delete = impl_delete;
+ source_class->delete_selected = impl_delete_selected;
- source_class->impl_try_playlist = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_pause = (RBSourceFeatureFunc) rb_false_function;
+ source_class->try_playlist = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_pause = (RBSourceFeatureFunc) rb_false_function;
g_object_class_install_property (object_class,
PROP_NORMAL_ENTRY_TYPE,
@@ -355,7 +355,7 @@ rb_import_errors_source_new (RBShell *shell,
}
static void
-impl_delete (RBSource *asource)
+impl_delete_selected (RBSource *asource)
{
RBImportErrorsSource *source = RB_IMPORT_ERRORS_SOURCE (asource);
GList *sel, *tem;
diff --git a/sources/rb-library-source.c b/sources/rb-library-source.c
index 835b953..fe656b6 100644
--- a/sources/rb-library-source.c
+++ b/sources/rb-library-source.c
@@ -215,11 +215,11 @@ rb_library_source_class_init (RBLibrarySourceClass *klass)
page_class->get_config_widget = impl_get_config_widget;
page_class->receive_drag = impl_receive_drag;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_paste = (RBSourceFeatureFunc) impl_can_paste;
- source_class->impl_paste = impl_paste;
- source_class->impl_want_uri = impl_want_uri;
- source_class->impl_add_uri = impl_add_uri;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_paste = (RBSourceFeatureFunc) impl_can_paste;
+ source_class->paste = impl_paste;
+ source_class->want_uri = impl_want_uri;
+ source_class->add_uri = impl_add_uri;
browser_source_class->has_drop_support = (RBBrowserSourceFeatureFunc) rb_true_function;
browser_source_class->pack_content = impl_pack_content;
diff --git a/sources/rb-media-player-source.c b/sources/rb-media-player-source.c
index 2004f68..8eb3160 100644
--- a/sources/rb-media-player-source.c
+++ b/sources/rb-media-player-source.c
@@ -120,21 +120,21 @@ rb_media_player_source_class_init (RBMediaPlayerSourceClass *klass)
page_class->receive_drag = impl_receive_drag;
page_class->delete_thyself = impl_delete_thyself;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_paste = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_get_delete_label = impl_get_delete_label;
- source_class->impl_delete = NULL;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_paste = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_false_function;
+ source_class->get_delete_label = impl_get_delete_label;
+ source_class->delete_selected = NULL;
browser_source_class->has_drop_support = (RBBrowserSourceFeatureFunc) rb_false_function;
- klass->impl_get_entries = NULL;
- klass->impl_get_capacity = NULL;
- klass->impl_get_free_space = NULL;
- klass->impl_add_playlist = NULL;
- klass->impl_remove_playlists = NULL;
- klass->impl_show_properties = NULL;
+ klass->get_entries = NULL;
+ klass->get_capacity = NULL;
+ klass->get_free_space = NULL;
+ klass->add_playlist = NULL;
+ klass->remove_playlists = NULL;
+ klass->show_properties = NULL;
g_object_class_install_property (object_class,
PROP_DEVICE_SERIAL,
@@ -311,7 +311,7 @@ rb_media_player_source_get_capacity (RBMediaPlayerSource *source)
{
RBMediaPlayerSourceClass *klass = RB_MEDIA_PLAYER_SOURCE_GET_CLASS (source);
- return klass->impl_get_capacity (source);
+ return klass->get_capacity (source);
}
guint64
@@ -319,7 +319,7 @@ rb_media_player_source_get_free_space (RBMediaPlayerSource *source)
{
RBMediaPlayerSourceClass *klass = RB_MEDIA_PLAYER_SOURCE_GET_CLASS (source);
- return klass->impl_get_free_space (source);
+ return klass->get_free_space (source);
}
/**
@@ -334,7 +334,7 @@ rb_media_player_source_get_entries (RBMediaPlayerSource *source,
GHashTable *entries)
{
RBMediaPlayerSourceClass *klass = RB_MEDIA_PLAYER_SOURCE_GET_CLASS (source);
- klass->impl_get_entries (source, category, entries);
+ klass->get_entries (source, category, entries);
}
/**
@@ -354,7 +354,7 @@ rb_media_player_source_delete_entries (RBMediaPlayerSource *source,
{
RBMediaPlayerSourceClass *klass = RB_MEDIA_PLAYER_SOURCE_GET_CLASS (source);
- klass->impl_delete_entries (source, entries, callback, user_data, destroy_data);
+ klass->delete_entries (source, entries, callback, user_data, destroy_data);
}
static void
@@ -441,8 +441,8 @@ rb_media_player_source_show_properties (RBMediaPlayerSource *source)
* .. battery levels?) and add more tabs to the notebook to display 'advanced' stuff.
*/
- if (klass->impl_show_properties) {
- klass->impl_show_properties (source,
+ if (klass->show_properties) {
+ klass->show_properties (source,
GTK_WIDGET (gtk_builder_get_object (builder, "device-info-box")),
GTK_WIDGET (gtk_builder_get_object (builder,
"media-player-notebook")));
}
@@ -473,7 +473,7 @@ sync_playlists (RBMediaPlayerSource *source)
GList *all_playlists;
GList *l;
- if (klass->impl_add_playlist == NULL || klass->impl_remove_playlists == NULL) {
+ if (klass->add_playlist == NULL || klass->remove_playlists == NULL) {
rb_debug ("source class doesn't support playlists");
return;
}
@@ -485,7 +485,7 @@ sync_playlists (RBMediaPlayerSource *source)
rb_media_player_source_get_entries (source, SYNC_CATEGORY_MUSIC, device);
/* remove all playlists from the device, then add the synced playlists. */
- klass->impl_remove_playlists (source);
+ klass->remove_playlists (source);
/* get all local playlists */
g_object_get (source, "shell", &shell, NULL);
@@ -542,7 +542,7 @@ sync_playlists (RBMediaPlayerSource *source)
/* transfer the playlist to the device */
rb_debug ("syncing playlist %s", name);
- klass->impl_add_playlist (source, name, tracks);
+ klass->add_playlist (source, name, tracks);
g_free (name);
g_list_free (tracks);
diff --git a/sources/rb-media-player-source.h b/sources/rb-media-player-source.h
index 5b6e846..48a1a3e 100644
--- a/sources/rb-media-player-source.h
+++ b/sources/rb-media-player-source.h
@@ -58,17 +58,17 @@ struct _RBMediaPlayerSourceClass
RBBrowserSourceClass parent_class;
/* class members */
- void (*impl_get_entries) (RBMediaPlayerSource *source, const char *category,
GHashTable *map);
- guint64 (*impl_get_capacity) (RBMediaPlayerSource *source);
- guint64 (*impl_get_free_space) (RBMediaPlayerSource *source);
- void (*impl_delete_entries) (RBMediaPlayerSource *source,
+ void (*get_entries) (RBMediaPlayerSource *source, const char *category, GHashTable *map);
+ guint64 (*get_capacity) (RBMediaPlayerSource *source);
+ guint64 (*get_free_space) (RBMediaPlayerSource *source);
+ void (*delete_entries) (RBMediaPlayerSource *source,
GList *entries,
RBMediaPlayerSourceDeleteCallback callback,
gpointer data,
GDestroyNotify destroy_data);
- void (*impl_add_playlist) (RBMediaPlayerSource *source, gchar *name, GList *entries);
- void (*impl_remove_playlists) (RBMediaPlayerSource *source);
- void (*impl_show_properties) (RBMediaPlayerSource *source, GtkWidget *info_box, GtkWidget
*notebook);
+ void (*add_playlist) (RBMediaPlayerSource *source, gchar *name, GList *entries);
+ void (*remove_playlists) (RBMediaPlayerSource *source);
+ void (*show_properties) (RBMediaPlayerSource *source, GtkWidget *info_box, GtkWidget
*notebook);
};
GType rb_media_player_source_get_type (void);
diff --git a/sources/rb-missing-files-source.c b/sources/rb-missing-files-source.c
index 4837e74..4490b58 100644
--- a/sources/rb-missing-files-source.c
+++ b/sources/rb-missing-files-source.c
@@ -67,7 +67,7 @@ static void rb_missing_files_source_get_property (GObject *object,
static RBEntryView *impl_get_entry_view (RBSource *source);
static void impl_song_properties (RBSource *source);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static void impl_get_status (RBDisplayPage *page, char **text, char **progress_text, float *progress);
static void rb_missing_files_source_songs_show_popup_cb (RBEntryView *view,
@@ -101,20 +101,20 @@ rb_missing_files_source_class_init (RBMissingFilesSourceClass *klass)
page_class->get_status = impl_get_status;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_can_rename = (RBSourceFeatureFunc) rb_false_function;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->can_rename = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_delete = impl_delete;
+ source_class->delete_selected = impl_delete_selected;
- source_class->impl_song_properties = impl_song_properties;
- source_class->impl_try_playlist = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_pause = (RBSourceFeatureFunc) rb_false_function;
+ source_class->song_properties = impl_song_properties;
+ source_class->try_playlist = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_pause = (RBSourceFeatureFunc) rb_false_function;
g_type_class_add_private (klass, sizeof (RBMissingFilesSourcePrivate));
}
@@ -326,7 +326,7 @@ impl_song_properties (RBSource *asource)
}
static void
-impl_delete (RBSource *asource)
+impl_delete_selected (RBSource *asource)
{
RBMissingFilesSource *source = RB_MISSING_FILES_SOURCE (asource);
GList *sel, *tem;
diff --git a/sources/rb-play-queue-source.c b/sources/rb-play-queue-source.c
index ea0f73c..53a82b0 100644
--- a/sources/rb-play-queue-source.c
+++ b/sources/rb-play-queue-source.c
@@ -199,11 +199,11 @@ rb_play_queue_source_class_init (RBPlayQueueSourceClass *klass)
object_class->finalize = rb_play_queue_source_finalize;
object_class->dispose = rb_play_queue_source_dispose;
- source_class->impl_can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_rename = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_rename = (RBSourceFeatureFunc) rb_false_function;
- playlist_class->impl_show_entry_view_popup = impl_show_entry_view_popup;
- playlist_class->impl_save_contents_to_xml = impl_save_contents_to_xml;
+ playlist_class->show_entry_view_popup = impl_show_entry_view_popup;
+ playlist_class->save_contents_to_xml = impl_save_contents_to_xml;
/**
* RBPlayQueueSource:sidebar:
@@ -548,7 +548,7 @@ static void
impl_save_contents_to_xml (RBPlaylistSource *source,
xmlNodePtr node)
{
- ((RBPlaylistSourceClass*)rb_play_queue_source_parent_class)->impl_save_contents_to_xml (source, node);
+ ((RBPlaylistSourceClass*)rb_play_queue_source_parent_class)->save_contents_to_xml (source, node);
xmlSetProp (node, RB_PLAYLIST_TYPE, RB_PLAYLIST_QUEUE);
}
diff --git a/sources/rb-playlist-source.c b/sources/rb-playlist-source.c
index 3169932..989413e 100644
--- a/sources/rb-playlist-source.c
+++ b/sources/rb-playlist-source.c
@@ -171,21 +171,21 @@ rb_playlist_source_class_init (RBPlaylistSourceClass *klass)
object_class->set_property = rb_playlist_source_set_property;
object_class->get_property = rb_playlist_source_get_property;
- source_class->impl_get_entry_view = impl_get_entry_view;
- source_class->impl_can_rename = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_add_to_queue = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_song_properties = impl_song_properties;
- source_class->impl_get_delete_label = impl_get_delete_label;
+ source_class->get_entry_view = impl_get_entry_view;
+ source_class->can_rename = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_add_to_queue = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_move_to_trash = (RBSourceFeatureFunc) rb_true_function;
+ source_class->song_properties = impl_song_properties;
+ source_class->get_delete_label = impl_get_delete_label;
page_class->can_remove = impl_can_remove;
page_class->remove = impl_remove;
- klass->impl_show_entry_view_popup = default_show_entry_view_popup;
- klass->impl_mark_dirty = default_mark_dirty;
+ klass->show_entry_view_popup = default_show_entry_view_popup;
+ klass->mark_dirty = default_mark_dirty;
/**
* RBPlaylistSource:db:
@@ -515,8 +515,8 @@ rb_playlist_source_songs_show_popup_cb (RBEntryView *view,
RBPlaylistSource *source)
{
RBPlaylistSourceClass *klass = RB_PLAYLIST_SOURCE_GET_CLASS (source);
- if (klass->impl_show_entry_view_popup)
- klass->impl_show_entry_view_popup (source, view, over_entry);
+ if (klass->show_entry_view_popup)
+ klass->show_entry_view_popup (source, view, over_entry);
}
static RBEntryView *
@@ -922,7 +922,7 @@ rb_playlist_source_save_to_xml (RBPlaylistSource *source,
}
- klass->impl_save_contents_to_xml (source, node);
+ klass->save_contents_to_xml (source, node);
source->priv->dirty = FALSE;
}
@@ -1111,7 +1111,7 @@ rb_playlist_source_mark_dirty (RBPlaylistSource *source)
g_return_if_fail (RB_IS_PLAYLIST_SOURCE (source));
klass = RB_PLAYLIST_SOURCE_GET_CLASS (source);
- klass->impl_mark_dirty (source);
+ klass->mark_dirty (source);
g_object_notify (G_OBJECT (source), "dirty");
}
diff --git a/sources/rb-playlist-source.h b/sources/rb-playlist-source.h
index ff7d353..87d623d 100644
--- a/sources/rb-playlist-source.h
+++ b/sources/rb-playlist-source.h
@@ -63,9 +63,9 @@ struct _RBPlaylistSourceClass
RBSourceClass parent;
/* methods */
- void (*impl_show_entry_view_popup) (RBPlaylistSource *source, RBEntryView *view, gboolean
over_entry);
- void (*impl_save_contents_to_xml) (RBPlaylistSource *source, xmlNodePtr node);
- void (*impl_mark_dirty) (RBPlaylistSource *source);
+ void (*show_entry_view_popup) (RBPlaylistSource *source, RBEntryView *view, gboolean
over_entry);
+ void (*save_contents_to_xml) (RBPlaylistSource *source, xmlNodePtr node);
+ void (*mark_dirty) (RBPlaylistSource *source);
};
GType rb_playlist_source_get_type (void);
diff --git a/sources/rb-source.c b/sources/rb-source.c
index 5cae1fa..0e4a6a6 100644
--- a/sources/rb-source.c
+++ b/sources/rb-source.c
@@ -156,22 +156,22 @@ rb_source_class_init (RBSourceClass *klass)
page_class->get_status = default_get_status;
klass->reset_filters = default_reset_filters;
- klass->impl_get_property_views = default_get_property_views;
- klass->impl_can_rename = default_can_rename;
- klass->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
- klass->impl_can_paste = (RBSourceFeatureFunc) rb_false_function;
- klass->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
- klass->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- klass->impl_can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
- klass->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
- klass->impl_can_pause = (RBSourceFeatureFunc) rb_true_function;
- klass->impl_get_entry_view = default_get_entry_view;
- klass->impl_copy = default_copy;
- klass->impl_handle_eos = default_handle_eos;
- klass->impl_try_playlist = default_try_playlist;
- klass->impl_add_to_queue = default_add_to_queue;
- klass->impl_get_delete_label = default_get_delete_label;
- klass->impl_move_to_trash = default_move_to_trash;
+ klass->get_property_views = default_get_property_views;
+ klass->can_rename = default_can_rename;
+ klass->can_cut = (RBSourceFeatureFunc) rb_false_function;
+ klass->can_paste = (RBSourceFeatureFunc) rb_false_function;
+ klass->can_delete = (RBSourceFeatureFunc) rb_false_function;
+ klass->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ klass->can_add_to_queue = (RBSourceFeatureFunc) rb_false_function;
+ klass->can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
+ klass->can_pause = (RBSourceFeatureFunc) rb_true_function;
+ klass->get_entry_view = default_get_entry_view;
+ klass->copy = default_copy;
+ klass->handle_eos = default_handle_eos;
+ klass->try_playlist = default_try_playlist;
+ klass->add_to_queue = default_add_to_queue;
+ klass->get_delete_label = default_get_delete_label;
+ klass->move_to_trash = default_move_to_trash;
/**
* RBSource:hidden-when-empty:
@@ -672,7 +672,7 @@ rb_source_get_entry_view (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_get_entry_view (source);
+ return klass->get_entry_view (source);
}
static GList *
@@ -695,7 +695,7 @@ rb_source_get_property_views (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_get_property_views (source);
+ return klass->get_property_views (source);
}
static gboolean
@@ -733,7 +733,7 @@ rb_source_can_rename (RBSource *source)
if (is_party_mode (source)) {
return FALSE;
} else {
- return klass->impl_can_rename (source);
+ return klass->can_rename (source);
}
}
@@ -757,8 +757,8 @@ rb_source_search (RBSource *source,
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
g_assert (new_text != NULL);
- if (klass->impl_search != NULL)
- klass->impl_search (source, search, cur_text, new_text);
+ if (klass->search != NULL)
+ klass->search (source, search, cur_text, new_text);
}
@@ -776,7 +776,7 @@ rb_source_can_cut (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_can_cut (source);
+ return klass->can_cut (source);
}
/**
@@ -792,7 +792,7 @@ rb_source_can_paste (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_can_paste (source);
+ return klass->can_paste (source);
}
/**
@@ -811,7 +811,7 @@ rb_source_can_delete (RBSource *source)
if (is_party_mode (source)) {
return FALSE;
} else {
- return klass->impl_can_delete (source);
+ return klass->can_delete (source);
}
}
@@ -831,7 +831,7 @@ rb_source_can_move_to_trash (RBSource *source)
if (is_party_mode (source)) {
return FALSE;
} else {
- return klass->impl_can_move_to_trash (source);
+ return klass->can_move_to_trash (source);
}
}
@@ -849,7 +849,7 @@ rb_source_can_copy (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_can_copy (source);
+ return klass->can_copy (source);
}
/**
@@ -867,7 +867,7 @@ rb_source_cut (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_cut (source);
+ return klass->cut (source);
}
static GList *
@@ -895,7 +895,7 @@ rb_source_copy (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_copy (source);
+ return klass->copy (source);
}
/**
@@ -919,7 +919,7 @@ rb_source_paste (RBSource *source, GList *entries)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_paste (source, entries);
+ return klass->paste (source, entries);
}
/**
@@ -935,7 +935,7 @@ gboolean
rb_source_can_add_to_queue (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_can_add_to_queue (source);
+ return klass->can_add_to_queue (source);
}
static void
@@ -976,21 +976,21 @@ rb_source_add_to_queue (RBSource *source,
RBSource *queue)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- klass->impl_add_to_queue (source, queue);
+ klass->add_to_queue (source, queue);
}
/**
- * rb_source_delete:
+ * rb_source_delete_selected:
* @source: a #RBSource
*
* Deletes the currently selected entries from the source.
*/
void
-rb_source_delete (RBSource *source)
+rb_source_delete_selected (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- klass->impl_delete (source);
+ klass->delete_selected (source);
}
static void
@@ -1031,7 +1031,7 @@ rb_source_move_to_trash (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- klass->impl_move_to_trash (source);
+ klass->move_to_trash (source);
}
static void
@@ -1054,7 +1054,7 @@ rb_source_can_show_properties (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return (klass->impl_song_properties != NULL);
+ return (klass->song_properties != NULL);
}
/**
@@ -1068,8 +1068,8 @@ rb_source_song_properties (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- g_assert (klass->impl_song_properties);
- klass->impl_song_properties (source);
+ g_assert (klass->song_properties);
+ klass->song_properties (source);
}
/**
@@ -1086,7 +1086,7 @@ rb_source_try_playlist (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_try_playlist (source);
+ return klass->try_playlist (source);
}
/**
@@ -1106,8 +1106,8 @@ guint
rb_source_want_uri (RBSource *source, const char *uri)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- if (klass->impl_want_uri)
- return klass->impl_want_uri (source, uri);
+ if (klass->want_uri)
+ return klass->want_uri (source, uri);
return 0;
}
@@ -1126,8 +1126,8 @@ gboolean
rb_source_uri_is_source (RBSource *source, const char *uri)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- if (klass->impl_uri_is_source)
- return klass->impl_uri_is_source (source, uri);
+ if (klass->uri_is_source)
+ return klass->uri_is_source (source, uri);
return FALSE;
}
@@ -1154,8 +1154,8 @@ rb_source_add_uri (RBSource *source,
GDestroyNotify destroy_data)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- if (klass->impl_add_uri)
- klass->impl_add_uri (source, uri, title, genre, callback, data, destroy_data);
+ if (klass->add_uri)
+ klass->add_uri (source, uri, title, genre, callback, data, destroy_data);
}
/**
@@ -1172,7 +1172,7 @@ rb_source_can_pause (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_can_pause (source);
+ return klass->can_pause (source);
}
static gboolean
@@ -1201,7 +1201,7 @@ rb_source_handle_eos (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_handle_eos (source);
+ return klass->handle_eos (source);
}
static RBEntryView*
@@ -1230,7 +1230,7 @@ char *
rb_source_get_delete_label (RBSource *source)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- return klass->impl_get_delete_label (source);
+ return klass->get_delete_label (source);
}
static gboolean
@@ -1482,8 +1482,8 @@ rb_source_get_playback_status (RBSource *source, char **text, float *progress)
{
RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
- if (klass->impl_get_playback_status)
- klass->impl_get_playback_status (source, text, progress);
+ if (klass->get_playback_status)
+ klass->get_playback_status (source, text, progress);
}
@@ -1530,38 +1530,3 @@ rb_source_load_status_get_type (void)
return etype;
}
-/* introspection annotations for vmethods */
-
-/**
- * impl_get_entry_view:
- * @source: a #RBSource
- *
- * Return value: (transfer none): the RBEntryView for the source
- */
-
-/**
- * impl_get_property_views:
- * @source: a #RBSource
- *
- * Return value: (element-type RB.PropertyView) (transfer container): list of property views
- */
-
-/**
- * impl_cut:
- * @source: a #RBSource
- *
- * Return value: (element-type RB.RhythmDBEntry) (transfer full): list of entries
- */
-
-/**
- * impl_copy:
- * @source: a #RBSource
- *
- * Return value: (element-type RB.RhythmDBEntry) (transfer full): list of entries
- */
-
-/**
- * impl_paste:
- * @source: a #RBSource
- * @entries: (element-type RB.RhythmDBEntry) (transfer none): list of entries to paste
- */
diff --git a/sources/rb-source.h b/sources/rb-source.h
index 3e3d99c..6a514c3 100644
--- a/sources/rb-source.h
+++ b/sources/rb-source.h
@@ -91,45 +91,45 @@ struct _RBSourceClass
/* methods */
- RBEntryView * (*impl_get_entry_view) (RBSource *source);
- GList * (*impl_get_property_views) (RBSource *source);
+ RBEntryView * (*get_entry_view) (RBSource *source);
+ GList * (*get_property_views) (RBSource *source);
- gboolean (*impl_can_rename) (RBSource *source);
+ gboolean (*can_rename) (RBSource *source);
- void (*impl_search) (RBSource *source, RBSourceSearch *search, const char
*cur_text, const char *new_text);
+ void (*search) (RBSource *source, RBSourceSearch *search, const char
*cur_text, const char *new_text);
- gboolean (*impl_can_cut) (RBSource *source);
- gboolean (*impl_can_delete) (RBSource *source);
- gboolean (*impl_can_move_to_trash) (RBSource *source);
- gboolean (*impl_can_copy) (RBSource *source);
- gboolean (*impl_can_paste) (RBSource *source);
- gboolean (*impl_can_add_to_queue)(RBSource *source);
+ gboolean (*can_cut) (RBSource *source);
+ gboolean (*can_delete) (RBSource *source);
+ gboolean (*can_move_to_trash) (RBSource *source);
+ gboolean (*can_copy) (RBSource *source);
+ gboolean (*can_paste) (RBSource *source);
+ gboolean (*can_add_to_queue) (RBSource *source);
- GList * (*impl_cut) (RBSource *source);
- GList * (*impl_copy) (RBSource *source);
- RBTrackTransferBatch *(*impl_paste) (RBSource *source, GList *entries);
- void (*impl_delete) (RBSource *source);
- void (*impl_add_to_queue) (RBSource *source, RBSource *queue);
- void (*impl_move_to_trash) (RBSource *source);
+ GList * (*cut) (RBSource *source);
+ GList * (*copy) (RBSource *source);
+ RBTrackTransferBatch *(*paste) (RBSource *source, GList *entries);
+ void (*delete_selected) (RBSource *source);
+ void (*add_to_queue) (RBSource *source, RBSource *queue);
+ void (*move_to_trash) (RBSource *source);
- void (*impl_song_properties) (RBSource *source);
+ void (*song_properties) (RBSource *source);
- gboolean (*impl_try_playlist) (RBSource *source);
- guint (*impl_want_uri) (RBSource *source, const char *uri);
- void (*impl_add_uri) (RBSource *source,
+ gboolean (*try_playlist) (RBSource *source);
+ guint (*want_uri) (RBSource *source, const char *uri);
+ void (*add_uri) (RBSource *source,
const char *uri,
const char *title,
const char *genre,
RBSourceAddCallback callback,
gpointer data,
GDestroyNotify destroy_data);
- gboolean (*impl_uri_is_source) (RBSource *source, const char *uri);
+ gboolean (*uri_is_source) (RBSource *source, const char *uri);
- gboolean (*impl_can_pause) (RBSource *source);
- RBSourceEOFType (*impl_handle_eos) (RBSource *source);
- void (*impl_get_playback_status) (RBSource *source, char **text, float *progress);
+ gboolean (*can_pause) (RBSource *source);
+ RBSourceEOFType (*handle_eos) (RBSource *source);
+ void (*get_playback_status) (RBSource *source, char **text, float *progress);
- char * (*impl_get_delete_label) (RBSource *source);
+ char * (*get_delete_label) (RBSource *source);
};
GType rb_source_get_type (void);
@@ -162,8 +162,8 @@ gboolean rb_source_can_show_properties (RBSource *source);
GList * rb_source_cut (RBSource *source);
GList * rb_source_copy (RBSource *source);
-RBTrackTransferBatch *rb_source_paste (RBSource *source, GList *entries);
-void rb_source_delete (RBSource *source);
+RBTrackTransferBatch *rb_source_paste (RBSource *source, GList *entries);
+void rb_source_delete_selected (RBSource *source);
void rb_source_add_to_queue (RBSource *source, RBSource *queue);
void rb_source_move_to_trash (RBSource *source);
diff --git a/sources/rb-static-playlist-source.c b/sources/rb-static-playlist-source.c
index 27497fb..4c60f70 100644
--- a/sources/rb-static-playlist-source.c
+++ b/sources/rb-static-playlist-source.c
@@ -76,7 +76,7 @@ static void rb_static_playlist_source_get_property (GObject *object,
/* source methods */
static GList * impl_cut (RBSource *source);
static RBTrackTransferBatch *impl_paste (RBSource *asource, GList *entries);
-static void impl_delete (RBSource *source);
+static void impl_delete_selected (RBSource *source);
static void impl_search (RBSource *asource, RBSourceSearch *search, const char *cur_text, const char
*new_text);
static void impl_reset_filters (RBSource *asource);
static gboolean impl_receive_drag (RBDisplayPage *page, GtkSelectionData *data);
@@ -163,17 +163,17 @@ rb_static_playlist_source_class_init (RBStaticPlaylistSourceClass *klass)
page_class->receive_drag = impl_receive_drag;
source_class->reset_filters = impl_reset_filters;
- source_class->impl_can_cut = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_paste = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_cut = impl_cut;
- source_class->impl_paste = impl_paste;
- source_class->impl_delete = impl_delete;
- source_class->impl_search = impl_search;
- source_class->impl_get_property_views = impl_get_property_views;
- source_class->impl_want_uri = impl_want_uri;
-
- playlist_class->impl_save_contents_to_xml = impl_save_contents_to_xml;
+ source_class->can_cut = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_paste = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->cut = impl_cut;
+ source_class->paste = impl_paste;
+ source_class->delete_selected = impl_delete_selected;
+ source_class->search = impl_search;
+ source_class->get_property_views = impl_get_property_views;
+ source_class->want_uri = impl_want_uri;
+
+ playlist_class->save_contents_to_xml = impl_save_contents_to_xml;
g_object_class_override_property (object_class,
PROP_BASE_QUERY_MODEL,
@@ -501,7 +501,7 @@ impl_paste (RBSource *asource, GList *entries)
}
static void
-impl_delete (RBSource *asource)
+impl_delete_selected (RBSource *asource)
{
RBEntryView *songs = rb_source_get_entry_view (asource);
RBStaticPlaylistSource *source = RB_STATIC_PLAYLIST_SOURCE (asource);
diff --git a/sources/rb-streaming-source.c b/sources/rb-streaming-source.c
index ab1bbd0..cfb69e6 100644
--- a/sources/rb-streaming-source.c
+++ b/sources/rb-streaming-source.c
@@ -112,11 +112,11 @@ rb_streaming_source_class_init (RBStreamingSourceClass *klass)
object_class->dispose = rb_streaming_source_dispose;
object_class->constructed = rb_streaming_source_constructed;
- source_class->impl_can_copy = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
- source_class->impl_can_pause = (RBSourceFeatureFunc) rb_false_function;
- source_class->impl_handle_eos = impl_handle_eos;
- source_class->impl_try_playlist = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_copy = (RBSourceFeatureFunc) rb_false_function;
+ source_class->can_delete = (RBSourceFeatureFunc) rb_true_function;
+ source_class->can_pause = (RBSourceFeatureFunc) rb_false_function;
+ source_class->handle_eos = impl_handle_eos;
+ source_class->try_playlist = (RBSourceFeatureFunc) rb_true_function;
g_type_class_add_private (klass, sizeof (RBStreamingSourcePrivate));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
