[libdmapsharing] Fix return value of dacp_player_now_playing_artwork to satisfy Vala Signed-off-by: W. Michael Petull
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Fix return value of dacp_player_now_playing_artwork to satisfy Vala Signed-off-by: W. Michael Petull
- Date: Sat, 15 Jan 2011 02:26:36 +0000 (UTC)
commit 8f9d7c281bbcc3543302b8584bc84fb2ae07160e
Author: W. Michael Petullo <mike flyn org>
Date: Fri Jan 14 20:25:46 2011 -0600
Fix return value of dacp_player_now_playing_artwork to satisfy Vala
Signed-off-by: W. Michael Petullo <mike flyn org>
libdmapsharing/dacp-player.c | 2 +-
libdmapsharing/dacp-player.h | 4 ++--
tests/dacplisten.vala | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/libdmapsharing/dacp-player.c b/libdmapsharing/dacp-player.c
index 3a22e46..31c3da3 100644
--- a/libdmapsharing/dacp-player.c
+++ b/libdmapsharing/dacp-player.c
@@ -102,7 +102,7 @@ dacp_player_now_playing_record (DACPPlayer *player)
return DACP_PLAYER_GET_INTERFACE (player)->now_playing_record (player);
}
-gchar *
+const guchar *
dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint height)
{
return DACP_PLAYER_GET_INTERFACE (player)->now_playing_artwork (player, width, height);
diff --git a/libdmapsharing/dacp-player.h b/libdmapsharing/dacp-player.h
index b402075..59e065b 100644
--- a/libdmapsharing/dacp-player.h
+++ b/libdmapsharing/dacp-player.h
@@ -83,7 +83,7 @@ struct _DACPPlayerIface
GTypeInterface parent_class;
DAAPRecord *(*now_playing_record) (DACPPlayer *player);
- gchar *(*now_playing_artwork) (DACPPlayer *player, guint width, guint height);
+ const guchar *(*now_playing_artwork) (DACPPlayer *player, guint width, guint height);
void (*play_pause) (DACPPlayer *player);
void (*pause) (DACPPlayer *player);
void (*next_item) (DACPPlayer *player);
@@ -107,7 +107,7 @@ DAAPRecord *dacp_player_now_playing_record (DACPPlayer *player);
* @width: width
* @height: height
*/
-gchar *dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint height);
+const guchar *dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint height);
/**
* dacp_player_play_pause
diff --git a/tests/dacplisten.vala b/tests/dacplisten.vala
index b11b52f..38ee0a1 100644
--- a/tests/dacplisten.vala
+++ b/tests/dacplisten.vala
@@ -27,8 +27,7 @@ private class ValaDACPPlayer : GLib.Object, DACP.Player {
return null;
}
- /* FIXME: This should return uint8[], modify dacp-player.h? */
- unowned string now_playing_artwork (uint width, uint heigth) {
+ unowned uchar[] now_playing_artwork (uint width, uint heigth) {
stdout.printf ("Now playing artwork request received\n");
return null;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]