Merge lp:~rodrigo-moya/libubuntuone/bring-music-store-live into lp:libubuntuone

[Rodrigo Moya]

Use now live music store as default location and add signal for previewing MP3

[Rodrigo Moya (rodrigo-moya)]

Use now live music store as default location and add signal for previewing MP3

[lp:~rodrigo-moya/libubuntuone/bring-music-store-live]

7. By Rodrigo Moya on 2009-12-21

Capture preview-mp3 signal in test program

[Elliot Murphy (statik)]

/usr/include/gtk-2.0/gtk/gtkcontainer.h:111: note: expected ‘struct GtkContainer *’ but argument is of type ‘struct GtkScrolledWindow *’

code looks pretty good! I get this compile error.

review: Needs Fixing

[lp:~rodrigo-moya/libubuntuone/bring-music-store-live]

8. By Rodrigo Moya on 2009-12-22

Kill some warnings

[Rodrigo Moya (rodrigo-moya)]

Fixed that warning and pushed again, so please try again

[Elliot Murphy (statik)]

I have to manually cd into libubuntuone and 'make u1-marshal.h' before it will compile for me, but otherwise looks good.

review: Approve

[lp:~rodrigo-moya/libubuntuone/bring-music-store-live]

9. By Rodrigo Moya on 2010-01-04

Killed another warning

=== modified file 'configure.ac'
--- configure.ac	2009-12-04 13:22:36 +0000
+++ configure.ac	2010-01-04 14:29:12 +0000
@@ -15,6 +15,9 @@
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+dnl glib-genmarshal
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
 dnl Look for needed modules
 PKG_CHECK_MODULES(LIBUBUNTUONE, webkit-1.0 libebook-1.2)
 AC_SUBST(LIBUBUNTUONE_CFLAGS)
@@ -27,14 +30,6 @@
 AC_SUBST(LIBUBUNTUONE_REVISION)
 AC_SUBST(LIBUBUNTUONE_AGE)
 
-dnl Argument for specifying the URL of the music store
-AC_MSG_CHECKING([store URL to use])
-AC_ARG_WITH([store-url],
-	AS_HELP_STRING([--with-store-url=url], [URL to use for the music store]),
-	[with_store_url=$withval], [with_store_url="http://www.google.com"])
-AC_MSG_RESULT([$with_store_url])
-AC_DEFINE_UNQUOTED(U1_STORE_URL, ["$with_store_url"], [Define to the URL to use for the store])
-
 ##################################################
 # Check for gtk-doc.
 ##################################################

=== modified file 'libubuntuone/Makefile.am'
--- libubuntuone/Makefile.am	2009-12-04 20:23:57 +0000
+++ libubuntuone/Makefile.am	2010-01-04 14:29:12 +0000
@@ -3,7 +3,17 @@
 
 lib_LTLIBRARIES = libubuntuone.la
 
+# Marshallers
+MARSHAL_GENERATED = u1-marshal.c u1-marshal.h
+
+u1-marshal.h: u1-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=_u1_marshal > $@
+
+u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@
+
 libubuntuone_la_SOURCES =	\
+	$(MARSHAL_GENERATED)	\
 	contacts-picker-model.c	\
 	contacts-picker-model.h	\
 	u1-contacts-picker.c	\
@@ -13,3 +23,5 @@
 u1include_HEADERS =		\
 	u1-contacts-picker.h	\
 	u1-music-store.h
+
+EXTRA_DIST = u1-marshal.list
\ No newline at end of file

=== modified file 'libubuntuone/u1-contacts-picker.c'
--- libubuntuone/u1-contacts-picker.c	2009-12-09 13:25:49 +0000
+++ libubuntuone/u1-contacts-picker.c	2010-01-04 14:29:12 +0000
@@ -80,7 +80,7 @@
 {
 	U1ContactsPicker *picker = (U1ContactsPicker *) data;
 
-	contacts_picker_model_search (gtk_icon_view_get_model (picker->priv->icon_view), gtk_entry_get_text (entry));
+	contacts_picker_model_search (gtk_icon_view_get_model (GTK_ICON_VIEW (picker->priv->icon_view)), gtk_entry_get_text (entry));
 }
 
 static void
@@ -123,7 +123,7 @@
 	model = contacts_picker_model_new ();
 	g_signal_connect (G_OBJECT (model), "row_inserted", G_CALLBACK (model_contact_added_cb), picker);
 	g_signal_connect (G_OBJECT (model), "row_deleted", G_CALLBACK (model_contact_removed_cb), picker);
-	gtk_icon_view_set_model (picker->priv->icon_view, model);
+	gtk_icon_view_set_model (GTK_ICON_VIEW (picker->priv->icon_view), model);
 
 	gtk_widget_show (picker->priv->icon_view);
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), picker->priv->icon_view);

=== added file 'libubuntuone/u1-marshal.list'
--- libubuntuone/u1-marshal.list	1970-01-01 00:00:00 +0000
+++ libubuntuone/u1-marshal.list	2010-01-04 14:29:12 +0000
@@ -0,0 +1,2 @@
+NONE:STRING,OBJECT
+NONE:STRING,STRING

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2009-11-26 12:12:21 +0000
+++ libubuntuone/u1-music-store.c	2010-01-04 14:29:12 +0000
@@ -19,16 +19,43 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "config.h"
 #include <webkit/webkit.h>
 #include "u1-music-store.h"
+#include "u1-marshal.h"
+
+#define U1_STORE_URL "http://www.7digital.com/stores/default.aspx?shop=34&partner=982"
+#define U1_PREVIEW_JAVASCRIPT "" \
+	"(function() {" \
+	"  // capture the preview" \
+	"  if (playTrack) {" \
+	"    playTrack = function(file, title) {" \
+	"      window.status = \"u1preview:::\" + file + \":::\" + title;" \
+	"    }" \
+	"  }" \
+	"  // and hide the flashplayer"\
+	"  var ply = document.getElementById(\"flashPlayer\");" \
+	"  if (ply) {" \
+	"    ply.parentNode.removeChild(ply);" \
+	"  }" \
+	"})()"
+#define U1_DEFAULT_ERROR_PAGE "<html><body>Could not load Music Store</body></html>"
 
 struct _U1MusicStorePrivate {
 	GtkWidget *web_viewer;
+
+	GdkCursor *busy_cursor;
+	GdkCursor *normal_cursor;
 };
 
 G_DEFINE_TYPE(U1MusicStore, u1_music_store, GTK_TYPE_VBOX)
 
+enum {
+	PREVIEW_MP3_SIGNAL,
+	LAST_SIGNAL
+};
+
+static guint u1_music_store_signals[LAST_SIGNAL] = { 0, };
+
 static void
 u1_music_store_finalize (GObject *object)
 {
@@ -47,9 +74,82 @@
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+	/* Signals */
+	u1_music_store_signals[PREVIEW_MP3_SIGNAL] = g_signal_new ("preview-mp3",
+								   G_TYPE_FROM_CLASS (klass),
+								   (GSignalFlags) G_SIGNAL_RUN_LAST,
+								   G_STRUCT_OFFSET (U1MusicStoreClass, preview_mp3),
+								   NULL,
+								   NULL,
+								   _u1_marshal_VOID__STRING_STRING,
+								   G_TYPE_NONE, 2,
+								   G_TYPE_STRING, G_TYPE_STRING);
 	object_class->finalize = u1_music_store_finalize;
 }
 
+static gboolean
+navigation_requested_cb (WebKitWebView *web_view,
+			 WebKitWebFrame *frame,
+			 WebKitNetworkRequest *request,
+			 WebKitWebNavigationAction *navigation_action,
+			 WebKitWebPolicyDecision *policy_decision,
+			 gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	/* Change the cursor when loading */
+	if (music_store->priv->normal_cursor)
+		gdk_cursor_unref (music_store->priv->normal_cursor);
+	music_store->priv->normal_cursor = gdk_window_get_cursor (GTK_WIDGET (web_view)->window);
+	gdk_cursor_ref (music_store->priv->normal_cursor);
+
+	if (music_store->priv->busy_cursor == NULL)
+		music_store->priv->busy_cursor = gdk_cursor_new_for_display (gdk_display_get_default (), GDK_WATCH);
+
+	gdk_window_set_cursor (GTK_WIDGET (web_view)->window, music_store->priv->busy_cursor);
+
+	/* Inform webkit to continue with the loading */
+	webkit_web_policy_decision_use (policy_decision);
+
+	return TRUE;
+}
+			 
+static void
+load_finished_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	/* Inject some JavaScript to enable previews and hide the Flash player */
+	webkit_web_view_execute_script (web_view, U1_PREVIEW_JAVASCRIPT);
+	gdk_window_set_cursor (GTK_WIDGET (web_view)->window, music_store->priv->normal_cursor);
+}
+
+static void
+status_bar_text_changed_cb (WebKitWebView *web_view, const gchar *text, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	if (g_str_has_prefix (text, "u1preview:::")) {
+		gchar **args;
+
+		args = g_strsplit (text, ":::", 0);
+		if (args != NULL) {
+			g_signal_emit (music_store, u1_music_store_signals[PREVIEW_MP3_SIGNAL], 0, args[1], args[2]);
+			g_strfreev (args);
+		}
+	}
+}
+
+static gboolean
+load_error_cb (WebKitWebView *web_view, WebKitWebFrame *frame, const gchar *uri, GError *error, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+
+	webkit_web_view_load_string (web_view, U1_DEFAULT_ERROR_PAGE, "text/html", "utf-8", "file:///");
+
+	return TRUE;
+}
+
 static void
 u1_music_store_init (U1MusicStore *music_store)
 {
@@ -65,9 +165,17 @@
 	gtk_widget_show (scroll);
 
 	music_store->priv->web_viewer = webkit_web_view_new ();
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "navigation-policy-decision-requested",
+			  G_CALLBACK (navigation_requested_cb), music_store);
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-finished",
+			  G_CALLBACK (load_finished_cb), music_store);
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "status-bar-text-changed",
+			  G_CALLBACK (status_bar_text_changed_cb), music_store);
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-error",
+			  G_CALLBACK (load_error_cb), music_store);
+	gtk_widget_show (music_store->priv->web_viewer);
+	gtk_container_add (GTK_CONTAINER (scroll), music_store->priv->web_viewer);
 	webkit_web_view_open (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), U1_STORE_URL);
-	gtk_widget_show (music_store->priv->web_viewer);
-	gtk_container_add (GTK_SCROLLED_WINDOW (scroll), music_store->priv->web_viewer);
 
 	gtk_box_pack_start (GTK_BOX (music_store), scroll, TRUE, TRUE, 3);
 }

=== modified file 'libubuntuone/u1-music-store.h'
--- libubuntuone/u1-music-store.h	2009-12-04 13:22:36 +0000
+++ libubuntuone/u1-music-store.h	2010-01-04 14:29:12 +0000
@@ -42,6 +42,9 @@
 
 typedef struct {
 	GtkVBoxClass parent_class;
+
+	/* Signals */
+	void (* preview_mp3) (U1MusicStore *music_store, const gchar *url, const gchar *title);
 } U1MusicStoreClass;
 
 GType      u1_music_store_get_type (void);

=== modified file 'tests/test-music-store.c'
--- tests/test-music-store.c	2009-11-26 12:12:21 +0000
+++ tests/test-music-store.c	2010-01-04 14:29:12 +0000
@@ -21,6 +21,20 @@
 
 #include <libubuntuone/u1-music-store.h>
 
+static void
+preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data)
+{
+	GtkWidget *dialog;
+
+	dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_store))),
+					 0,
+					 GTK_MESSAGE_INFO,
+					 GTK_BUTTONS_OK,
+					 "Requested preview of file %s with title %s", url, title);
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -31,9 +45,11 @@
 
 	/* Create the main window */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_widget_set_size_request (window, 839, 600);
 	g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
 	music_store = u1_music_store_new ();
+	g_signal_connect (G_OBJECT (music_store), "preview-mp3", G_CALLBACK (preview_mp3_cb), NULL);
 	gtk_widget_show (music_store);
 	gtk_container_add (GTK_CONTAINER (window), music_store);