Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21863/src
Modified Files:
Makefile.am fetchcover.c file_itunesdb.c prefs_window.c
Removed Files:
lastfm.c lastfm.h
Log Message:
* configure.in
src/Makefile.am
src/fetchcover.c
src/file_itunesdb.c
src/prefs_window.c
src/lastfm.[ch]: removed lastfm support because the code is
not ready and abandoned. I've left the tab in the prefs
window and the md5.[ch] files in CVS in case someone else
wants to have another try.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Makefile.am 15 Apr 2007 13:27:42 -0000 1.63
+++ Makefile.am 27 Apr 2007 15:50:44 -0000 1.64
@@ -47,9 +47,7 @@
info.c info.h \
ipod_init.c ipod_init.h \
itdb.h \
- lastfm.c lastfm.h \
main.c \
- md5.c md5.h \
misc.c misc.h \
misc_confirm.c misc_conversion.c misc_input.c \
misc_playlist.c \
Index: fetchcover.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/fetchcover.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fetchcover.c 23 Apr 2007 15:33:31 -0000 1.5
+++ fetchcover.c 27 Apr 2007 15:50:44 -0000 1.6
@@ -814,38 +814,40 @@
*/
void on_coverart_context_menu_click (GList *tracks)
{
- Track *track;
-
- track = tracks->data;
-
- GtkDialog *dialog = fetchcover_display_dialog (track,
track->itdb->device);
- g_return_if_fail (dialog);
-
- gint result = gtk_dialog_run (GTK_DIALOG (dialog));
+ Track *track;
+ gint result;
+
+ track = tracks->data;
+
+ GtkDialog *dialog = fetchcover_display_dialog (track, track->itdb->device);
+ g_return_if_fail (dialog);
+
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
+
#ifdef HAVE_CURL
gchar *filename = NULL;
switch (result)
{
- case GTK_RESPONSE_ACCEPT:
- filename = fetchcover_save ();
- if (filename)
- {
- while (tracks)
- {
- track = tracks->data;
- if (gp_track_set_thumbnails (track,
filename))
- data_changed (track->itdb);
- tracks = tracks->next;
- }
- }
- g_free (filename);
- default:
+ case GTK_RESPONSE_ACCEPT:
+ filename = fetchcover_save ();
+ if (filename)
+ {
+ while (tracks)
+ {
+ track = tracks->data;
+ if (gp_track_set_thumbnails (track, filename))
+ data_changed (track->itdb);
+ tracks = tracks->next;
+ }
+ }
+ g_free (filename);
+ default:
break;
}
- #endif /* HAVE_CURL */
+#endif /* HAVE_CURL */
- fetchcover_cleanup();
+ fetchcover_cleanup();
gtk_widget_destroy (GTK_WIDGET (dialog));
}
@@ -860,56 +862,57 @@
*/
void on_fetchcover_fetch_button (GtkWidget *widget, gpointer data)
{
- Detail *detail = details_get_selected_detail ();
- GtkDialog *dialog = fetchcover_display_dialog (detail->track,
detail->itdb->device);
- g_return_if_fail (dialog);
+ gint result;
+ Detail *detail = details_get_selected_detail ();
+ GtkDialog *dialog = fetchcover_display_dialog (detail->track,
detail->itdb->device);
+ g_return_if_fail (dialog);
- gint result = gtk_dialog_run (GTK_DIALOG (dialog));
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
- #ifdef HAVE_CURL
+#ifdef HAVE_CURL
- gchar *filename = NULL;
- switch (result)
- {
- case GTK_RESPONSE_ACCEPT:
+ gchar *filename = NULL;
+ switch (result)
+ {
+ case GTK_RESPONSE_ACCEPT:
filename = fetchcover_save ();
if (filename)
{
- if (details_writethrough(detail))
- {
- GList *list;
- for (list = detail->tracks; list; list
= list->next)
- {
- ExtraTrackData *etd;
- Track *track = list->data;
-
- if (!track)
- break;
-
- etd = track->userdata;
- gp_track_set_thumbnails(track,
filename);
- etd->tchanged = TRUE;
- }
- }
- else
- {
- ExtraTrackData *etd =
fetchcover_track->userdata;
- if (etd)
- {
-
gp_track_set_thumbnails(fetchcover_track, filename);
- etd->tchanged = TRUE;
- }
- }
-
- detail->changed = TRUE;
- details_update_thumbnail(detail);
- details_update_buttons(detail);
+ if (details_writethrough(detail))
+ {
+ GList *list;
+ for (list = detail->tracks; list; list = list->next)
+ {
+ ExtraTrackData *etd;
+ Track *track = list->data;
+
+ if (!track)
+ break;
+
+ etd = track->userdata;
+ gp_track_set_thumbnails(track, filename);
+ etd->tchanged = TRUE;
+ }
+ }
+ else
+ {
+ ExtraTrackData *etd = fetchcover_track->userdata;
+ if (etd)
+ {
+ gp_track_set_thumbnails(fetchcover_track, filename);
+ etd->tchanged = TRUE;
+ }
+ }
+
+ detail->changed = TRUE;
+ details_update_thumbnail(detail);
+ details_update_buttons(detail);
}
- default:
- break;
- }
- #endif /* HAVE_CURL */
+ default:
+ break;
+ }
+#endif /* HAVE_CURL */
- fetchcover_cleanup();
- gtk_widget_destroy (GTK_WIDGET (dialog));
+ fetchcover_cleanup();
+ gtk_widget_destroy (GTK_WIDGET (dialog));
}
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- file_itunesdb.c 23 Apr 2007 15:33:31 -0000 1.118
+++ file_itunesdb.c 27 Apr 2007 15:50:44 -0000 1.119
@@ -44,7 +44,6 @@
#include "syncdir.h"
#include "tools.h"
#include "ipod_init.h"
-#include "lastfm.h"
#include "file_convert.h"
#include "display_coverart.h"
@@ -587,10 +586,6 @@
{
Track *track = gl->data;
- /* Send eligible tracks to last.fm cache */
- if (track->recent_playcount > 0)
- lastfm_add_track(track);
-
ExtraTrackData *etr;
g_return_val_if_fail (track, (release_widgets(), NULL));
etr = track->userdata;
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- prefs_window.c 23 Apr 2007 15:41:21 -0000 1.197
+++ prefs_window.c 27 Apr 2007 15:50:44 -0000 1.198
@@ -34,7 +34,7 @@
#include "info.h"
#include "fileselection.h"
#include "sha1.h"
-#include "md5.h"
+/*#include "md5.h"*/
#include "misc.h"
#include "misc_track.h"
#include "prefs.h"
@@ -520,8 +520,8 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("autoimport"));
- /* last.fm */
-#if HAVE_CURL
+#if 0
+ /* last.fm -- disabled, we'll hide the prefs window */
int x = prefs_get_int("lastfm_active");
GtkWidget *u = gtkpod_xml_get_widget (prefs_window_xml, "lastfm_username");
GtkWidget *p = gtkpod_xml_get_widget (prefs_window_xml, "lastfm_password");
@@ -1551,6 +1551,7 @@
on_lastfm_active_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
+#if 0
int x = gtk_toggle_button_get_active(togglebutton);
GtkWidget *u = gtkpod_xml_get_widget (prefs_window_xml,
"lastfm_username");
GtkWidget *p = gtkpod_xml_get_widget (prefs_window_xml,
"lastfm_password");
@@ -1558,22 +1559,26 @@
gtk_widget_set_sensitive (u, x);
gtk_widget_set_sensitive (p, x);
+#endif
}
void
on_lastfm_username_entry_changed (GtkEditable *editable,
gpointer user_data)
{
+#if 0
gchar *uname;
uname = gtk_editable_get_chars (editable, 0, -1);
temp_prefs_set_string(temp_prefs, "lastfm_username", uname);
g_free (uname);
+#endif
}
void
on_lastfm_password_entry_changed (GtkEditable *editable,
gpointer user_data)
{
+#if 0
gchar *upass, *upass_old;
upass = gtk_editable_get_chars (editable, 0, -1);
@@ -1596,6 +1601,7 @@
}
g_free (upass);
g_free (upass_old);
+#endif
}
--- lastfm.c DELETED ---
--- lastfm.h DELETED ---
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
