[rhythmbox] Prepend DACP enums with DACP and require libdmapsharing >= 2.9.11 Signed-off-by: W. Michael Petullo

[W. Michael Petullo <wmpetullo src gnome org>]

commit 8ab9e5d08fd0bdfae25de00c225308d575736d50
Author: W. Michael Petullo <mike flyn org>
Date:   Tue May 24 11:48:39 2011 -0500

    Prepend DACP enums with DACP and require libdmapsharing >= 2.9.11
    Signed-off-by: W. Michael Petullo <mike flyn org>

 configure.ac                  |    2 +-
 plugins/daap/rb-dacp-player.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3065970..27d77f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -717,7 +717,7 @@ AC_ARG_ENABLE(daap,
                              [Disable DAAP support]),,
               enable_daap=auto)
 if test "x$enable_daap" != "xno"; then
-	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-3.0 >= 2.9.9,
+	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-3.0 >= 2.9.11,
 			  have_libdmapsharing=yes,
 			  have_libdmapsharing=no)
 	if test "x$have_libdmapsharing" = "xno" -a "x$enable_daap" = "xyes"; then
diff --git a/plugins/daap/rb-dacp-player.c b/plugins/daap/rb-dacp-player.c
index 9b92aac..5b43dc9 100644
--- a/plugins/daap/rb-dacp-player.c
+++ b/plugins/daap/rb-dacp-player.c
@@ -188,16 +188,16 @@ rb_dacp_player_get_property (GObject *object,
 			break;
 		case PROP_REPEAT_STATE:
 			rb_shell_player_get_playback_state (player->priv->shell_player, &shuffle, &repeat);
-			g_value_set_enum (value, repeat ? REPEAT_ALL : REPEAT_NONE);
+			g_value_set_enum (value, repeat ? DACP_REPEAT_ALL : DACP_REPEAT_NONE);
 			break;
 		case PROP_PLAY_STATE:
 			entry = rb_shell_player_get_playing_entry (player->priv->shell_player);
 			if (entry) {
 				g_object_get (player->priv->shell_player, "playing", &playing, NULL);
-				g_value_set_enum (value, playing ? PLAY_PLAYING : PLAY_PAUSED);
+				g_value_set_enum (value, playing ? DACP_PLAY_PLAYING : DACP_PLAY_PAUSED);
 				rhythmdb_entry_unref (entry);
 			} else {
-				g_value_set_enum (value, PLAY_STOPPED);
+				g_value_set_enum (value, DACP_PLAY_STOPPED);
 			}
 			break;
 		case PROP_VOLUME:
@@ -234,7 +234,7 @@ rb_dacp_player_set_property (GObject *object,
 			break;
 		case PROP_REPEAT_STATE:
 			rb_shell_player_get_playback_state (player->priv->shell_player, &shuffle, &repeat);
-			rb_shell_player_set_playback_state (player->priv->shell_player, shuffle, g_value_get_enum (value) != REPEAT_NONE);
+			rb_shell_player_set_playback_state (player->priv->shell_player, shuffle, g_value_get_enum (value) != DACP_REPEAT_NONE);
 			break;
 		case PROP_VOLUME:
 			volume = ((double) g_value_get_ulong (value))  / 100.0;