[rhythmbox] audioscrobbler: rename RBLastfmPlayOrder to RBAudioscrobblerPlayOrder

[Jonathan Matthew <jmatthew src gnome org>]

commit e17cde6131b4f199451e904b131f295e26da2031
Author: Jamie Nicol <jamie thenicols net>
Date:   Thu Aug 12 16:24:47 2010 +0100

    audioscrobbler: rename RBLastfmPlayOrder to RBAudioscrobblerPlayOrder
    
    for consistency with other classes used in the plugin: the class
    also represents the play order of a Libre.fm radio source, not just
    a Last.fm one.

 plugins/audioscrobbler/Makefile.am                 |    4 +-
 ...play-order.c => rb-audioscrobbler-play-order.c} |   26 ++++++++++----------
 ...play-order.h => rb-audioscrobbler-play-order.h} |   26 ++++++++++----------
 .../rb-audioscrobbler-radio-source.c               |    4 +-
 4 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index 7aedc80..8157794 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -21,8 +21,8 @@ libaudioscrobbler_la_SOURCES = \
 	rb-audioscrobbler-radio-source.h		\
 	rb-audioscrobbler-radio-track-entry-type.h	\
 	rb-audioscrobbler-radio-track-entry-type.c	\
-	rb-lastfm-play-order.c				\
-	rb-lastfm-play-order.h
+	rb-audioscrobbler-play-order.c			\
+	rb-audioscrobbler-play-order.h
 
 libaudioscrobbler_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libaudioscrobbler_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/plugins/audioscrobbler/rb-lastfm-play-order.c b/plugins/audioscrobbler/rb-audioscrobbler-play-order.c
similarity index 72%
rename from plugins/audioscrobbler/rb-lastfm-play-order.c
rename to plugins/audioscrobbler/rb-audioscrobbler-play-order.c
index 2feb35d..2c12dd8 100644
--- a/plugins/audioscrobbler/rb-lastfm-play-order.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-play-order.c
@@ -27,19 +27,19 @@
 
 #include "config.h"
 
-#include "rb-lastfm-play-order.h"
+#include "rb-audioscrobbler-play-order.h"
 #include "rb-debug.h"
 
-static void rb_lastfm_play_order_class_init (RBLastfmPlayOrderClass *klass);
+static void rb_audioscrobbler_play_order_class_init (RBAudioscrobblerPlayOrderClass *klass);
 
-G_DEFINE_TYPE (RBLastfmPlayOrder, rb_lastfm_play_order, RB_TYPE_PLAY_ORDER)
+G_DEFINE_TYPE (RBAudioscrobblerPlayOrder, rb_audioscrobbler_play_order, RB_TYPE_PLAY_ORDER)
 
 RBPlayOrder *
-rb_lastfm_play_order_new (RBShellPlayer *player)
+rb_audioscrobbler_play_order_new (RBShellPlayer *player)
 {
-	RBLastfmPlayOrder *lorder;
+	RBAudioscrobblerPlayOrder *lorder;
 
-	lorder = g_object_new (RB_TYPE_LASTFM_PLAY_ORDER,
+	lorder = g_object_new (RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER,
 			       "player", player,
 			       NULL);
 
@@ -47,13 +47,13 @@ rb_lastfm_play_order_new (RBShellPlayer *player)
 }
 
 static RhythmDBEntry *
-rb_lastfm_play_order_get_next (RBPlayOrder *porder)
+rb_audioscrobbler_play_order_get_next (RBPlayOrder *porder)
 {
 	RhythmDBQueryModel *model;
 	RhythmDBEntry *entry;
 
 	g_return_val_if_fail (porder != NULL, NULL);
-	g_return_val_if_fail (RB_IS_LASTFM_PLAY_ORDER (porder), NULL);
+	g_return_val_if_fail (RB_IS_AUDIOSCROBBLER_PLAY_ORDER (porder), NULL);
 
 	model = rb_play_order_get_query_model (porder);
 	if (model == NULL)
@@ -74,22 +74,22 @@ rb_lastfm_play_order_get_next (RBPlayOrder *porder)
 }
 
 static RhythmDBEntry *
-rb_lastfm_play_order_get_previous (RBPlayOrder *porder)
+rb_audioscrobbler_play_order_get_previous (RBPlayOrder *porder)
 {
 	/* can never go back */
 	return NULL;
 }
 
 static void
-rb_lastfm_play_order_init (RBLastfmPlayOrder *porder)
+rb_audioscrobbler_play_order_init (RBAudioscrobblerPlayOrder *porder)
 {
 }
 
 static void
-rb_lastfm_play_order_class_init (RBLastfmPlayOrderClass *klass)
+rb_audioscrobbler_play_order_class_init (RBAudioscrobblerPlayOrderClass *klass)
 {
 	RBPlayOrderClass *porder = RB_PLAY_ORDER_CLASS (klass);
-	porder->get_next = rb_lastfm_play_order_get_next;
-	porder->get_previous = rb_lastfm_play_order_get_previous;
+	porder->get_next = rb_audioscrobbler_play_order_get_next;
+	porder->get_previous = rb_audioscrobbler_play_order_get_previous;
 }
 
diff --git a/plugins/audioscrobbler/rb-lastfm-play-order.h b/plugins/audioscrobbler/rb-audioscrobbler-play-order.h
similarity index 57%
rename from plugins/audioscrobbler/rb-lastfm-play-order.h
rename to plugins/audioscrobbler/rb-audioscrobbler-play-order.h
index 2c52a12..406ac73 100644
--- a/plugins/audioscrobbler/rb-lastfm-play-order.h
+++ b/plugins/audioscrobbler/rb-audioscrobbler-play-order.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef __RB_LASTFM_PLAY_ORDER_H
-#define __RB_LASTFM_PLAY_ORDER_H
+#ifndef __RB_AUDIOSCROBBLER_PLAY_ORDER_H
+#define __RB_AUDIOSCROBBLER_PLAY_ORDER_H
 
 #include "rb-play-order.h"
 
@@ -34,27 +34,27 @@
 
 G_BEGIN_DECLS
 
-#define RB_TYPE_LASTFM_PLAY_ORDER         (rb_lastfm_play_order_get_type ())
-#define RB_LASTFM_PLAY_ORDER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), RB_TYPE_LASTFM_PLAY_ORDER, RBLastfmPlayOrder))
-#define RB_LASTFM_PLAY_ORDER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), RB_TYPE_LASTFM_PLAY_ORDER, RBLastfmPlayOrderClass))
-#define RB_IS_LASTFM_PLAY_ORDER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), RB_TYPE_LASTFM_PLAY_ORDER))
-#define RB_IS_LASTFM_PLAY_ORDER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), RB_TYPE_LASTFM_PLAY_ORDER))
-#define RB_LASTFM_PLAY_ORDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), RB_TYPE_LASTFM_PLAY_ORDER, RBLastfmPlayOrderClass))
+#define RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER         (rb_audioscrobbler_play_order_get_type ())
+#define RB_AUDIOSCROBBLER_PLAY_ORDER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER, RBAudioscrobblerPlayOrder))
+#define RB_AUDIOSCROBBLER_PLAY_ORDER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER, RBAudioscrobblerPlayOrderClass))
+#define RB_IS_AUDIOSCROBBLER_PLAY_ORDER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER))
+#define RB_IS_AUDIOSCROBBLER_PLAY_ORDER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER))
+#define RB_AUDIOSCROBBLER_PLAY_ORDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), RB_TYPE_AUDIOSCROBBLER_PLAY_ORDER, RBAudioscrobblerPlayOrderClass))
 
 typedef struct
 {
 	RBPlayOrder parent;
-} RBLastfmPlayOrder;
+} RBAudioscrobblerPlayOrder;
 
 typedef struct
 {
 	RBPlayOrderClass parent_class;
-} RBLastfmPlayOrderClass;
+} RBAudioscrobblerPlayOrderClass;
 
-GType			rb_lastfm_play_order_get_type	(void);
+GType			rb_audioscrobbler_play_order_get_type	(void);
 
-RBPlayOrder *		rb_lastfm_play_order_new	(RBShellPlayer *player);
+RBPlayOrder *		rb_audioscrobbler_play_order_new	(RBShellPlayer *player);
 
 G_END_DECLS
 
-#endif /* __RB_LASTFM_PLAY_ORDER_H */
+#endif /* __RB_AUDIOSCROBBLER_PLAY_ORDER_H */
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
index 7ab2570..2bf1eeb 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
@@ -43,7 +43,7 @@
 
 #include "rb-audioscrobbler-radio-source.h"
 #include "rb-audioscrobbler-radio-track-entry-type.h"
-#include "rb-lastfm-play-order.h"
+#include "rb-audioscrobbler-play-order.h"
 #include "rb-debug.h"
 #include "rb-sourcelist.h"
 #include "rb-util.h"
@@ -436,7 +436,7 @@ rb_audioscrobbler_radio_source_constructed (GObject *object)
 	g_object_set (source, "query-model", source->priv->track_model, NULL);
 
 	/* play order */
-	source->priv->play_order = rb_lastfm_play_order_new (RB_SHELL_PLAYER (rb_shell_get_player (shell)));
+	source->priv->play_order = rb_audioscrobbler_play_order_new (RB_SHELL_PLAYER (rb_shell_get_player (shell)));
 
 	/* signals */
 	g_signal_connect_object (rb_shell_get_player (shell),