commit 66ae43a73c5838e932c6ad76bc4ff4264db37ff8
Author: Paul Richardson aka phantomjinx <[email protected]>
Date: Thu Apr 15 23:03:37 2010 +0100
Change TODO warning to messages
* Seeing as warnings could stop compilation or debugging if some
flags have been set, better to make TODO statements as messages
libgtkpod/Makefile.am | 3 +-
libgtkpod/autodetection.c | 1 +
libgtkpod/autodetection.h | 1 +
src/autodetection.c | 19 ++++++----
src/autodetection.h | 4 ++-
src/display_itdb.c | 14 +++++---
src/display_playlists.c | 52 ++++++++++++----------------
src/display_sorttabs.c | 22 +++++------
src/display_tracks.c | 14 ++++----
src/file.c | 82 ++++++++++++++++++++++-----------------------
src/file_convert.c | 6 ++--
src/file_itunesdb.c | 14 ++++----
src/misc.c | 2 +-
src/misc_playlist.c | 19 ++++------
src/misc_track.c | 6 ++--
src/prefs.c | 14 ++++----
src/sha1.c | 2 +-
src/sort_window.c | 2 +-
src/tools.c | 14 ++++----
19 files changed, 144 insertions(+), 147 deletions(-)
---
diff --git a/libgtkpod/Makefile.am b/libgtkpod/Makefile.am
index 214addb..bbc6352 100644
--- a/libgtkpod/Makefile.am
+++ b/libgtkpod/Makefile.am
@@ -28,7 +28,8 @@ libgtkpod_la_SOURCES = gtkpod_app_iface.h gtkpod_app_iface.c
\
mp3file.c mp3file.h \
mp4file.c mp4file.h \
oggfile.c oggfile.h \
- wavfile.c wavfile.h
+ wavfile.c wavfile.h \
+ autodetection.c autodetection.h
# Include paths
AM_CFLAGS = \
diff --git a/libgtkpod/autodetection.c b/libgtkpod/autodetection.c
new file mode 120000
index 0000000..a58e81c
--- /dev/null
+++ b/libgtkpod/autodetection.c
@@ -0,0 +1 @@
+../src/autodetection.c
\ No newline at end of file
diff --git a/libgtkpod/autodetection.h b/libgtkpod/autodetection.h
new file mode 120000
index 0000000..9441a26
--- /dev/null
+++ b/libgtkpod/autodetection.h
@@ -0,0 +1 @@
+../src/autodetection.h
\ No newline at end of file
diff --git a/src/autodetection.c b/src/autodetection.c
index 9a961df..5f23645 100644
--- a/src/autodetection.c
+++ b/src/autodetection.c
@@ -25,15 +25,18 @@
|
| $Id$
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
-
+#include <stdio.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
#include "autodetection.h"
-#include "config.h"
+#include "gp_itdb.h"
+#include "gtkpod_app_iface.h"
#include "misc.h"
#include "prefs.h"
-#include <stdio.h>
-#include <string.h>
-
#ifdef HAVE_GNOME_VFS
@@ -67,7 +70,7 @@ static iTunesDB *ad_find_repository_with_mountpoint (const
gchar *mountpoint)
g_return_val_if_fail (mountpoint, NULL);
- itdbs = gp_get_itdbs_head (gtkpod_window);
+ itdbs = gp_get_itdbs_head ();
g_return_val_if_fail (itdbs, NULL);
/* eliminate trailing dir separators ('/') */
@@ -129,7 +132,7 @@ struct _AutoDetect
GMutex *mutex; /* shared lock */
GList *new_ipod_uris; /* list of new mounts */
guint timeout_id;
-};
+};
static AutoDetect *autodetect;
@@ -372,7 +375,7 @@ static gboolean ad_timeout_cb (gpointer data)
itdb = ad_find_repository_with_mountpoint (mountpoint);
- itdbs = gp_get_itdbs_head (gtkpod_window);
+ itdbs = gp_get_itdbs_head ();
g_return_val_if_fail (itdbs, (gdk_threads_leave(),
release_widgets(), TRUE));
block_widgets ();
diff --git a/src/autodetection.h b/src/autodetection.h
index 37c6b4d..6bf12b5 100644
--- a/src/autodetection.h
+++ b/src/autodetection.h
@@ -27,7 +27,9 @@
*/
#ifndef AUTODETECTION_H
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
void autodetection_init ();
#endif
diff --git a/src/display_itdb.c b/src/display_itdb.c
index ef83a55..f0526c7 100644
--- a/src/display_itdb.c
+++ b/src/display_itdb.c
@@ -43,6 +43,7 @@
#include "misc_track.h"
#include "prefs.h"
#include "syncdir.h"
+#include "autodetection.h"
/* A struct containing a list with available iTunesDBs. A pointer to
this struct is stored in gtkpod_app as itdbs_head */
@@ -137,7 +138,7 @@ iTunesDB *gp_itdb_new(void) {
/* Free itdb and take care of dependencies */
void gp_itdb_free(iTunesDB *itdb) {
- g_warning("TODO signal all things such as conversions to cancel");
+ g_message("TODO signal all things such as conversions to cancel");
// /* cancel all pending conversions */
// file_convert_cancel_itdb (itdb);
@@ -247,7 +248,7 @@ Track *gp_track_add(iTunesDB *itdb, Track *track) {
itdb_track_add(itdb, track, -1);
/* add to filename hash */
gp_itdb_pc_path_hash_add_track(track);
- g_warning("TODO should there be a conversion interface to initiate a
conversion");
+ g_message("TODO should there be a conversion interface to initiate a
conversion");
// /* add to background conversion if necessary */
// file_convert_add_track (track);
result = track;
@@ -274,10 +275,10 @@ void gp_track_remove(Track *track) {
before when you make sure @track is no longer referenced in any
playlist -- see gp_playlist_remove_track for details */
void gp_track_unlink(Track *track) {
- g_warning("TODO need to remove track from playlists and details window if
necessary");
+ g_message("TODO need to remove track from playlists and details window if
necessary");
/* the details window may be accessing the tracks */
// details_remove_track(track);
- g_warning("TODO signal that any file conversions on track be cancelled");
+ g_message("TODO signal that any file conversions on track be cancelled");
/* cancel pending conversions */
// file_convert_cancel_track(track);
/* remove from SHA1 hash */
@@ -821,6 +822,9 @@ void gp_init(GtkPodApp *single_app, int argc, char *argv[])
{
}
}
+ /* Initiate autodetection */
+ autodetection_init();
+
/* Create tooltips */
main_tooltips = gtk_tooltips_new();
g_object_set_data(G_OBJECT (gtkpod_app), "main_tooltips", main_tooltips);
@@ -981,7 +985,7 @@ gboolean gp_increase_playcount(gchar *sha1, gchar *file,
gint num) {
track->playcount += num;
data_changed(itdb);
buf1 = get_track_info(track, TRUE);
- g_warning("TODO gp_itdb:gp_increase_playcount - status\n");
+ g_message("TODO gp_itdb:gp_increase_playcount - status\n");
// gtkpod_statusbar_message (_("Increased playcount for '%s'"),
// buf1);
g_free(buf1);
diff --git a/src/display_playlists.c b/src/display_playlists.c
index 5126eb1..7eed6ee 100644
--- a/src/display_playlists.c
+++ b/src/display_playlists.c
@@ -91,30 +91,34 @@ static gboolean pm_get_iter_for_playlist(Playlist *pl,
GtkTreeIter *iter);
* pressed)
*
* ---------------------------------------------------------------- */
+static void pm_drag_begin (GtkWidget *widget, GdkDragContext *drag_context,
gpointer user_data) {
+/* puts ("drag_begin"); */
+}
-static void pm_drag_begin(GtkWidget *widget, GdkDragContext *drag_context,
gpointer user_data) {
- /* puts ("drag_begin"); */
+static void pm_drag_data_delete_remove_playlist(GtkTreeModel *tm, GtkTreePath
*tp, GtkTreeIter *iter, gpointer data) {
+ Playlist *pl;
+ g_return_if_fail (tm);
+ g_return_if_fail (iter);
+ gtk_tree_model_get (tm, iter, PM_COLUMN_PLAYLIST, &pl, -1);
+ g_return_if_fail (pl);
+ gp_playlist_remove (pl);
}
/* remove dragged playlist after successful MOVE */
-static void pm_drag_data_delete(GtkWidget *widget, GdkDragContext
*drag_context, gpointer user_data) {
- void pm_drag_data_delete_remove_playlist(GtkTreeModel *tm, GtkTreePath
*tp, GtkTreeIter *iter, gpointer data) {
- Playlist *pl;
- g_return_if_fail (tm);
- g_return_if_fail (iter);
- gtk_tree_model_get(tm, iter, PM_COLUMN_PLAYLIST, &pl, -1);
- g_return_if_fail (pl);
- gp_playlist_remove(pl);
- }
-
+static void pm_drag_data_delete (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gpointer user_data)
+{
g_return_if_fail (widget);
g_return_if_fail (drag_context);
- /* printf ("drag_data_delete: %d\n", drag_context->action); */
+/* printf ("drag_data_delete: %d\n", drag_context->action); */
- if (drag_context->action == GDK_ACTION_MOVE) {
- GtkTreeSelection *ts = gtk_tree_view_get_selection(GTK_TREE_VIEW
(widget));
- gtk_tree_selection_selected_foreach(ts,
pm_drag_data_delete_remove_playlist, NULL);
+ if (drag_context->action == GDK_ACTION_MOVE)
+ {
+ GtkTreeSelection *ts = gtk_tree_view_get_selection(
+ GTK_TREE_VIEW (widget));
+ gtk_tree_selection_selected_foreach (ts,
pm_drag_data_delete_remove_playlist, NULL);
}
}
@@ -802,7 +806,6 @@ static void pm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
static gboolean on_playlist_treeview_key_release_event(GtkWidget *widget,
GdkEventKey *event, gpointer user_data) {
guint mods;
-
mods = event->state;
if (!widgets_blocked && (mods & GDK_CONTROL_MASK)) {
@@ -2049,12 +2052,7 @@ GtkTreeView* pm_create_treeview(void) {
return playlist_treeview;
}
-Playlist*
-pm_get_selected_playlist(void) {
- /* return(current_playlist);*/
- /* we can't just return the "current_playlist" because the context
- menus require the selection before "current_playlist" is updated */
-
+Playlist* pm_get_selected_playlist(void) {
GtkTreeSelection *ts;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -2075,12 +2073,7 @@ pm_get_selected_playlist(void) {
return result;
}
-Itdb_iTunesDB*
-pm_get_selected_itdb(void) {
- /* return(current_playlist);*/
- /* we can't just return the "current_playlist" because the context
- menus require the selection before "current_playlist" is updated */
-
+Itdb_iTunesDB* pm_get_selected_itdb(void) {
GtkTreeSelection *ts;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -2192,4 +2185,3 @@ void playlist_display_track_removed_cb(GtkPodApp *app,
gpointer tk, gint32 pos,
pm_remove_track(current_playlist, old_track);
}
-
diff --git a/src/display_sorttabs.c b/src/display_sorttabs.c
index 28b2ca9..7406ad9 100644
--- a/src/display_sorttabs.c
+++ b/src/display_sorttabs.c
@@ -277,7 +277,7 @@ static void on_st_switch_page(GtkNotebook *notebook,
GtkNotebookPage *page, guin
if (page_num != ST_CAT_SPECIAL) {
st_set_string_compare_func(inst, page_num);
}
- g_warning("on_st_switch_page: space_data_update commented out");
+ g_message("TODO: on_st_switch_page: space_data_update commented out");
// space_data_update();
st_page_selected(notebook, page_num);
}
@@ -585,7 +585,7 @@ static void sp_go_cb(gpointer user_data1, gpointer
user_data2) {
time.tv_sec % 3600, time.tv_usec);
#endif
- g_warning ("sp_go_cb: space_data_update todo");
+ g_message("TODO: sp_go_cb: space_data_update todo");
// space_data_update();
/* Sanity */
@@ -1341,8 +1341,6 @@ static void st_track_changed_normal(Track *track,
gboolean removed, guint32 inst
tabs he/she just edited, disappeared from the display */
void st_track_changed(Track *track, gboolean removed, guint32 inst) {
if (inst == prefs_get_int("sort_tab_num")) {
- g_warning("st_track_changed: signal that a track has been changed");
- // tm_track_changed(track);
return;
}
else if (inst < prefs_get_int("sort_tab_num")) {
@@ -1796,7 +1794,7 @@ void st_sort(GtkSortType order) {
* displaytracks list in coverart recreated.
* ie. easy to sort ascending and descending but difficult to return to
unsorted state
*/
- g_warning("st_sort - signal coverart display to update itself");
+ g_message("TODO: st_sort - signal coverart display to update itself");
// coverart_display_update(order == SORT_NONE);
}
@@ -1950,7 +1948,7 @@ static gboolean st_selection_changed_cb(gpointer data) {
// }
}
- g_warning("st_selection_changed_cb: space_data_update");
+ g_message("TODO: st_selection_changed_cb: space_data_update");
// space_data_update();
#if DEBUG_TIMING
@@ -2064,7 +2062,7 @@ static void st_cell_edited(GtkCellRendererText *renderer,
const gchar *path_stri
*itemp_utf8 = g_strdup(new_text);
}
track->time_modified = time(NULL);
- g_warning("st_cell_edited: signal that a track has changed");
+ g_message("TODO: st_cell_edited: signal that a track has
changed");
// pm_track_changed(track);
/* If prefs say to write changes to file, do so */
if (prefs_get_int("id3_write")) {
@@ -2291,7 +2289,7 @@ static void st_adjust_visible(void) {
gtk_widget_hide(GTK_WIDGET (st_paned[i]));
}
- g_warning("Need to work out how to disable more and less sort tab
actions");
+ g_message("TODO: Need to work out how to disable more and less sort tab
actions");
// /* activate / deactiveate "less sort tabs" menu item */
// w = gtkpod_xml_get_widget(main_window_xml, "less_sort_tabs");
// if (n == 0)
@@ -2324,7 +2322,7 @@ void st_show_visible(void) {
static void st_set_visible_sort_tab_paned(void) {
// gint i, x, y, p0, num, width;
- g_warning("Determine whether to need to store the paned sizes and
positions anymore?");
+ g_message("TODO: Determine whether to need to store the paned sizes and
positions anymore?");
// num = prefs_get_int("sort_tab_num");
// if (num > 0) {
// gchar *buf;
@@ -2397,7 +2395,7 @@ static gboolean st_button_press_event(GtkWidget *w,
GdkEventButton *e, gpointer
switch (e->button) {
case 3:
st_select_current_position(GPOINTER_TO_INT(data), e->x, e->y);
- g_warning("TODO: context menu for sorttabs display");
+ g_message("TODO: context menu for sorttabs display");
// st_context_menu_init(GPOINTER_TO_INT(data));
return TRUE;
default:
@@ -2813,7 +2811,7 @@ void st_set_default_sizes(void) {
/* GtkPaned elements */
g_return_if_fail (gtkpod_app);
- g_warning("Not sure whether to set positions of paneds based on prefs");
+ g_message("TODO: Not sure whether to set positions of paneds based on
prefs");
// /* Elements defined with glade */
// for (i = 0; i < PANED_NUM_GLADE; ++i) {
// gchar *buf = g_strdup_printf("paned%d", i);
@@ -2838,7 +2836,7 @@ void st_set_default_sizes(void) {
position of GtkPaned elements */
void st_update_default_sizes(void) {
/* GtkPaned elements */
- g_warning("Not sure whether need to update default size of sorttabs");
+ g_message("TODO: Not sure whether need to update default size of
sorttabs");
// if (gtkpod_window) {
// gint i;
// /* Elements defined with glade */
diff --git a/src/display_tracks.c b/src/display_tracks.c
index eb3695d..0aa793f 100644
--- a/src/display_tracks.c
+++ b/src/display_tracks.c
@@ -783,7 +783,7 @@ static void tm_rating_edited(RBCellRendererRating
*renderer, const gchar *path_s
if ((int) rating * ITDB_RATING_STEP != track->rating) {
track->rating = (int) rating * ITDB_RATING_STEP;
track->time_modified = time(NULL);
- g_warning("TODO - signal that a track has been changed");
+ g_message("TODO - signal that a track has been changed");
// pm_track_changed (track);
data_changed(track->itdb);
@@ -923,7 +923,7 @@ static void tm_cell_edited(GtkCellRendererText *renderer,
const gchar *path_stri
/* printf (" changed: %d\n", changed); */
if (changed) {
track->time_modified = time(NULL);
- g_warning("TODO - signal that a track has been changed");
+ g_message("TODO - signal that a track has been changed");
// pm_track_changed (track); /* notify playlist model...
*/
data_changed(track->itdb); /* indicate that data has changed */
@@ -1229,7 +1229,7 @@ static void tm_cell_toggled(GtkCellRendererToggle
*renderer, gchar *arg1, gpoint
if ((column == TM_COLUMN_LYRICS) && (selected_tracks != NULL)) {
/* set displayed page to the lyrics page */
- g_warning("TODO - display_tracks: set displayed page to the lyrics
page in details window");
+ g_message("TODO - display_tracks: set displayed page to the lyrics
page in details window");
// prefs_set_int (DETAILS_WINDOW_NOTEBOOK_PAGE, 3);
// details_edit (selected_tracks);
g_list_free(selected_tracks);
@@ -1343,7 +1343,7 @@ void tm_rows_reordered(void) {
sort tabs */
if (changed) {
data_changed(itdb);
- g_warning("TODO - do we need to st_adopt_order_in_playlist");
+ g_message("TODO - do we need to st_adopt_order_in_playlist");
// st_adopt_order_in_playlist();
}
}
@@ -2234,7 +2234,7 @@ static gboolean tm_button_press_event(GtkWidget *w,
GdkEventButton *e, gpointer
break;
case 3:
tm_select_current_position(e->x, e->y);
- g_warning("TODO - context menu of track display");
+ g_message("TODO - context menu of track display");
// tm_context_menu_init();
return TRUE;
default:
@@ -2256,10 +2256,10 @@ static gboolean tm_selection_changed_cb(gpointer data) {
if (col_id != -1)
tm_set_search_column(col_id);
}
- g_warning("TODO - update info track view");
+ g_message("TODO - update info track view");
// info_update_track_view();
- g_warning("TODO - update coverart view");
+ g_message("TODO - update coverart view");
/* update the coverart display */
// GList *selected =
display_get_selection(prefs_get_int("sort_tab_num"));
// if (selected != NULL) {
diff --git a/src/file.c b/src/file.c
index 087e040..b7157b3 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1425,7 +1425,7 @@ void mserv_from_file_tracks(GList *selected_tracks) {
g_return_if_fail (etr);
buf = get_track_info(track, TRUE);
- g_warning("TODO file:mserv_from_file_tracks - status needed\n");
+ g_message("TODO file:mserv_from_file_tracks - status needed\n");
// gtkpod_statusbar_message (_("Retrieving mserv data %s"), buf);
g_free(buf);
if (etr->pc_path_locale && *etr->pc_path_locale)
@@ -1453,7 +1453,7 @@ void display_non_updated(Track *track, gchar *txt) {
if (prefs_get_int("show_non_updated") && str->len) { /* Some tracks
have not been updated. Print a notice */
buf
= g_strdup_printf(ngettext("The following track could not
be updated", "The following %d tracks could not be updated", track_nr),
track_nr);
- g_warning("TODO file:display_non_updated - status needed\n");
+ g_message("TODO file:display_non_updated - status needed\n");
// gtkpod_confirmation
// (-1, /* gint id, */
// FALSE, /* gboolean modal, */
@@ -1512,22 +1512,21 @@ void display_updated(Track *track, gchar *txt) {
if (str->len) { /* Some tracks have been updated. Print a notice */
buf
= g_strdup_printf(ngettext("The following track has been
updated", "The following %d tracks have been updated", track_nr), track_nr);
- g_warning("file:display_updated - status needed\n");
- // gtkpod_confirmation
- // (-1, /* gint id, */
- // FALSE, /* gboolean modal, */
- // _("Successful Track Update"), /* title */
- // buf, /* label */
- // str->str, /* scrolled text */
- // NULL, 0, NULL, /* option 1 */
- // NULL, 0, NULL, /* option 2 */
- // TRUE, /* gboolean confirm_again, */
- // "show_updated",/* confirm_again_key,*/
- // CONF_NULL_HANDLER, /* ConfHandler ok_handler,*/
- // NULL, /* don't show "Apply" button */
- // NULL, /* cancel_handler,*/
- // NULL, /* gpointer user_data1,*/
- // NULL); /* gpointer user_data2,*/
+ gtkpod_confirmation
+ (-1, /* gint id, */
+ FALSE, /* gboolean modal, */
+ _("Successful Track Update"), /* title */
+ buf, /* label */
+ str->str, /* scrolled text */
+ NULL, 0, NULL, /* option 1 */
+ NULL, 0, NULL, /* option 2 */
+ TRUE, /* gboolean confirm_again, */
+ "show_updated",/* confirm_again_key,*/
+ CONF_NULL_HANDLER, /* ConfHandler ok_handler,*/
+ NULL, /* don't show "Apply" button */
+ NULL, /* cancel_handler,*/
+ NULL, /* gpointer user_data1,*/
+ NULL); /* gpointer user_data2,*/
g_free(buf);
}
display_updated((void *) -1, NULL);
@@ -1571,22 +1570,21 @@ void display_mserv_problems(Track *track, gchar *txt) {
if (prefs_get_int("mserv_use") && prefs_get_int("mserv_report_probs")
&& str->len) { /* Some tracks have had problems. Print a notice */
buf
= g_strdup_printf(ngettext("No mserv information could be
retrieved for the following track", "No mserv information could be retrieved
for the following %d tracks", track_nr), track_nr);
- g_warning("file:display_mserv_problems - status needed\n");
- // gtkpod_confirmation
- // (-1, /* gint id, */
- // FALSE, /* gboolean modal, */
- // _("mserv data retrieval problem"), /* title */
- // buf, /* label */
- // str->str, /* scrolled text */
- // NULL, 0, NULL, /* option 1 */
- // NULL, 0, NULL, /* option 2 */
- // TRUE, /* gboolean confirm_again, */
- // "mserv_report_probs",/* confirm_again_key,*/
- // CONF_NULL_HANDLER, /* ConfHandler ok_handler,*/
- // NULL, /* don't show "Apply" button */
- // NULL, /* cancel_handler,*/
- // NULL, /* gpointer user_data1,*/
- // NULL); /* gpointer user_data2,*/
+ gtkpod_confirmation
+ (-1, /* gint id, */
+ FALSE, /* gboolean modal, */
+ _("mserv data retrieval problem"), /* title */
+ buf, /* label */
+ str->str, /* scrolled text */
+ NULL, 0, NULL, /* option 1 */
+ NULL, 0, NULL, /* option 2 */
+ TRUE, /* gboolean confirm_again, */
+ "mserv_report_probs",/* confirm_again_key,*/
+ CONF_NULL_HANDLER, /* ConfHandler ok_handler,*/
+ NULL, /* don't show "Apply" button */
+ NULL, /* cancel_handler,*/
+ NULL, /* gpointer user_data1,*/
+ NULL); /* gpointer user_data2,*/
g_free(buf);
}
display_mserv_problems((void *) -1, NULL);
@@ -1736,12 +1734,12 @@ void update_track_from_file(iTunesDB *itdb, Track
*track) {
track->ipod_path = g_strdup("");
track->transferred = FALSE;
- g_warning("TODO file:track_updated - cancel convert track\n");
+ g_message("TODO file:track_updated - cancel convert track\n");
// /* cancel conversion/transfer of track */
// file_convert_cancel_track (track);
/* mark the track for deletion on the ipod */
mark_track_for_deletion(itdb, new_track);
- g_warning("TODO file:track updated - reschedule track
conversion\n");
+ g_message("TODO file:track updated - reschedule track
conversion\n");
// /* reschedule conversion/transfer of track */
// file_convert_add_track (track);
@@ -1759,7 +1757,7 @@ void update_track_from_file(iTunesDB *itdb, Track *track)
{
data_changed(itdb);
netr->tchanged = FALSE;
}
- g_warning("TODO coverart may have changed only");
+ g_message("TODO coverart may have changed only");
// else
// {
// /* Rather than depend on the track data being changed,
only the artwork may have changed
@@ -1996,7 +1994,7 @@ gboolean add_track_by_filename(iTunesDB *itdb, gchar
*fname, Playlist *plitem, g
/* Call the correct tag writing function for the filename @name */
static gboolean file_write_info(gchar *name, Track *track) {
- g_warning("TODO file:write_file_info - defer to installed plugins");
+ g_message("TODO file:write_file_info - defer to installed plugins");
// gchar *buf;
//
// g_return_val_if_fail (name, FALSE);
@@ -2226,7 +2224,7 @@ void parse_offline_playcount(void) {
rewind(file);
if (gstr->len != 0) {
gint result = 0;
- g_warning("TODO file:parse_offline_playcount - status\n");
+ g_message("TODO file:parse_offline_playcount - status\n");
// gint result = gtkpod_confirmation
// (-1, /* gint id, */
// TRUE, /* gboolean modal, */
@@ -2271,7 +2269,7 @@ void parse_offline_playcount(void) {
* Return value: TRUE, if gain could be read
*/
gboolean read_soundcheck(Track *track) {
- g_warning("TODO file:read_soundcheck - need to defer to plugin");
+ g_message("TODO file:read_soundcheck - need to defer to plugin");
// gchar *path;
// gchar *buf;
// gboolean result = FALSE;
@@ -2328,7 +2326,7 @@ gboolean read_soundcheck(Track *track) {
/* Get lyrics from file */
gboolean read_lyrics_from_file(Track *track, gchar **lyrics) {
- g_warning("TODO file:read_lyrics_from_file - need to defer to plugins");
+ g_message("TODO file:read_lyrics_from_file - need to defer to plugins");
// gchar *path;
// gchar *buf;
// gboolean result = FALSE;
@@ -2392,7 +2390,7 @@ gboolean read_lyrics_from_file(Track *track, gchar
**lyrics) {
/* Write lyrics to file */
gboolean write_lyrics_to_file(Track *track) {
- g_warning("TODO file:write_lyrics_to_file - need to defer to plugins\n");
+ g_message("TODO file:write_lyrics_to_file - need to defer to plugins\n");
// gchar *path=NULL;
// gchar *buf;
// Track *oldtrack;
diff --git a/src/file_convert.c b/src/file_convert.c
index 4053f4f..cd4173e 100644
--- a/src/file_convert.c
+++ b/src/file_convert.c
@@ -515,7 +515,7 @@ static void conversion_display_hide_log_window (Conversion
*conv)
// GtkWidget *mi;
/* show display log if it was previously hidden and should be
shown again */
- g_warning("TODO coversion_display_hide_log_window - commented out\n");
+ g_message("TODO coversion_display_hide_log_window - commented out\n");
// mi = gtkpod_xml_get_widget (main_window_xml, "view_conversion_log");
// if (prefs_get_int (FILE_CONVERT_DISPLAY_LOG))
// {
@@ -1677,7 +1677,7 @@ static gboolean conversion_scheduler_unlocked (Conversion
*conv)
is never read and free space keeps
increasing while we copy more and more
files to the iPod */
- g_warning("TODO space_data_update");
+ g_message("TODO space_data_update");
// space_data_update ();
debug ("transfer finalized: %s (%d)\n",
conversion_get_track_info (NULL, ctr),
@@ -2479,7 +2479,7 @@ static gboolean conversion_convert_track (Conversion
*conv, ConvTrack *ctr)
g_mutex_unlock (conv->mutex);
track = gp_track_new ();
- g_warning("TODO read gapless for filetype without knowing its
mp3\n");
+ g_message("TODO read gapless for filetype without knowing its
mp3\n");
// retval = mp3_read_gapless (ctr->converted_file, track);
retval = FALSE;
diff --git a/src/file_itunesdb.c b/src/file_itunesdb.c
index 77b1ec1..54797ca 100644
--- a/src/file_itunesdb.c
+++ b/src/file_itunesdb.c
@@ -121,7 +121,7 @@ void fill_in_extended_info(Track *track, gint32 total,
gint32 num) {
sei = g_hash_table_lookup(extendedinfohash, &ipod_id);
}
if (!sei && extendedinfohash_sha1) {
- g_warning("TODO - file_itunesdb:fill_in_extended_info. status\n");
+ g_message("TODO - file_itunesdb:fill_in_extended_info. status\n");
// gtkpod_statusbar_message (
// _("Matching SHA1 checksum for file %d/%d"),
// num, total);
@@ -695,7 +695,7 @@ static iTunesDB *gp_merge_itdb(iTunesDB *old_itdb) {
g_return_val_if_fail (old_eitdb->offline_filename, NULL);
new_itdb = gp_import_itdb(old_itdb, old_itdb->usertype, mountpoint,
old_eitdb->offline_filename, NULL);
- g_warning("TODO load photodb handle\n");
+ g_message("TODO load photodb handle\n");
// if (new_itdb)
// gphoto_load_photodb(new_itdb);
}
@@ -933,7 +933,7 @@ gboolean gp_save_itdb(iTunesDB *itdb) {
/* update smart playlists before writing */
itdb_spl_update_live(itdb);
- g_warning("TODO - update smart playlists before writing\n");
+ g_message("TODO - update smart playlists before writing\n");
// pl = pm_get_selected_playlist();
// if (pl && (pl->itdb == itdb) && pl->is_spl &&
pl->splpref.liveupdate) { /* Update display if necessary */
// st_redisplay(0);
@@ -1021,7 +1021,7 @@ static gboolean write_extended_info(iTunesDB *itdb) {
eitdb = itdb->userdata;
g_return_val_if_fail (eitdb, FALSE);
- g_warning("TODO - method to update space upon write\n");
+ g_message("TODO - method to update space upon write\n");
// space_data_update();
name = g_strdup_printf("%s.ext", itdb->filename);
@@ -1807,7 +1807,7 @@ static gboolean gp_write_itdb(iTunesDB *itdb) {
}
/* indicate that files and/or database is saved */
- g_warning("TODO indicate that database has been saved\n");
+ g_message("TODO indicate that database has been saved\n");
if (success) {
data_unchanged(itdb);
if (itdb->usertype & GP_ITDB_TYPE_IPOD) {
@@ -1880,7 +1880,7 @@ void data_changed(iTunesDB *itdb) {
}
else {
eitdb->data_changed = TRUE;
- g_warning("TODO data_changed needs work to notify interested
parties\n");
+ g_message("TODO data_changed needs work to notify interested
parties\n");
// pm_itdb_name_changed(itdb);
// space_data_update();
}
@@ -1898,7 +1898,7 @@ void data_unchanged(iTunesDB *itdb) {
if (eitdb->photo_data_changed == TRUE)
eitdb->photo_data_changed = FALSE;
- g_warning("TODO data_unchanged notify\n");
+ g_message("TODO data_unchanged notify\n");
// pm_itdb_name_changed(itdb);
// space_data_update();
}
diff --git a/src/misc.c b/src/misc.c
index b8e54de..24a79cb 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -71,7 +71,7 @@ enum {
/* function to add one widget to the blocked_widgets list */
static GList *add_blocked_widget(GList *blocked_widgets, gchar *name) {
- g_warning("TODO misc:add_blocked_widget - commented out\n");
+ g_message("TODO misc:add_blocked_widget - commented out\n");
// GtkWidget *w;
// struct blocked_widget *bw;
// if((w = gtkpod_xml_get_widget (main_window_xml, name)))
diff --git a/src/misc_playlist.c b/src/misc_playlist.c
index 04efeb3..6620374 100644
--- a/src/misc_playlist.c
+++ b/src/misc_playlist.c
@@ -75,7 +75,7 @@ Playlist *add_new_pl_user_name(iTunesDB *itdb, gchar *dflt,
gint32 position) {
= get_user_string(_("New Playlist"), _("Please enter a name for
the new playlist"), dflt ? dflt : _("New Playlist"), NULL, NULL, GTK_STOCK_ADD);
if (name) {
result = gp_playlist_add_new(itdb, name, FALSE, position);
- g_warning("TODO add_new_playlist_user_name - status\n");
+ g_message("TODO add_new_playlist_user_name - status\n");
// gtkpod_tracks_statusbar_update ();
}
return result;
@@ -107,7 +107,7 @@ void add_new_pl_or_spl_user_name(iTunesDB *itdb, gchar
*dflt, gint32 position) {
if (name) {
if (!is_spl) { /* add standard playlist */
gp_playlist_add_new(itdb, name, FALSE, position);
- g_warning("TODO add_new_pl_or_spl_username - status\n");
+ g_message("TODO add_new_pl_or_spl_username - status\n");
// gtkpod_tracks_statusbar_update ();
}
else { /* add smart playlist */
@@ -251,7 +251,7 @@ Playlist *generate_random_playlist(iTunesDB *itdb) {
}
void randomize_current_playlist(void) {
- g_warning("TODO randomize_current_playlist commented out\n");
+ g_message("TODO randomize_current_playlist commented out\n");
// Playlist *pl= pm_get_selected_playlist ();
//
// if (!pl)
@@ -329,8 +329,6 @@ Playlist *generate_not_listed_playlist(iTunesDB *itdb) {
Playlist *generate_playlist_with_name(iTunesDB *itdb, GList *tracks, gchar
*pl_name, gboolean del_old) {
Playlist *new_pl = NULL;
gint n = g_list_length(tracks);
-
- g_warning("generate_playlist_with_name\n");
g_return_val_if_fail (itdb, new_pl);
if (n > 0) {
@@ -354,7 +352,6 @@ Playlist *generate_playlist_with_name(iTunesDB *itdb, GList
*tracks, gchar *pl_n
g_return_val_if_fail (new_pl, new_pl);
for (l = tracks; l; l = l->next) {
Track *track = l->data;
- g_warning("generate_playlist_with_name: Track is %p", track);
g_return_val_if_fail (track, new_pl);
gp_playlist_add_track(new_pl, track, TRUE);
}
@@ -802,7 +799,7 @@ static void check_db_danglingok1(gpointer user_data1,
gpointer user_data2) {
/* printf("Handling track %d\n", track->ipod_id); */
buf = get_track_info(track, TRUE);
- g_warning("TODO check_db_danglingok1- status\n");
+ g_message("TODO check_db_danglingok1- status\n");
// gtkpod_statusbar_message (_("Processing '%s'..."), buf);
g_free(buf);
@@ -905,7 +902,7 @@ void check_db(iTunesDB *itdb) {
}
}
- g_warning("TODO check_db - status\n");
+ g_message("TODO check_db - status\n");
// gtkpod_statusbar_timeout (30*STATUSBAR_TIMEOUT);
block_widgets();
@@ -1128,13 +1125,13 @@ static void delete_playlist_ok(struct DeleteData *dd) {
}
if (itdb_playlist_is_mpl(dd->pl)) {
msg = g_strdup_printf(_("Removed all %d tracks from the
iPod"), n);
- g_warning("TODO: reset display");
+ g_message("TODO: reset display");
// display_reset(0);
}
else if (itdb_playlist_is_podcasts(dd->pl)) {
msg = g_strdup_printf(_("Removed all podcasts from the iPod"));
if (gtkpod_get_current_playlist() == dd->pl)
- g_warning("TODO: reset only sorttabs");
+ g_message("TODO: reset only sorttabs");
// st_redisplay(0);
}
else {
@@ -1191,7 +1188,7 @@ static void delete_playlist_ok(struct DeleteData *dd) {
}
if (itdb_playlist_is_mpl(dd->pl)) {
msg = g_strdup_printf(_("Removed all %d tracks from the
database"), n);
- g_warning("TODO: reset display");
+ g_message("TODO: reset display");
// display_reset(0);
}
else {
diff --git a/src/misc_track.c b/src/misc_track.c
index cd51e91..96f145c 100644
--- a/src/misc_track.c
+++ b/src/misc_track.c
@@ -188,7 +188,7 @@ void gp_duplicate_remove(Track *oldtrack, Track *track) {
"The following %d duplicate tracks have not
been added to the master play list.",
deltrack_nr), deltrack_nr);
}
- g_warning("TODO misc_track:gp_duplicate_remove - return status\n");
+ g_message("TODO misc_track:gp_duplicate_remove - return status\n");
// gtkpod_confirmation
// (-1, /* gint id, */
// FALSE, /* gboolean modal, */
@@ -1954,7 +1954,7 @@ void delete_track_ok(struct DeleteData *dd) {
if (!dd->tracks)
delete_track_cancel(dd);
- g_warning("TODO: determine whether still need to block changes while
deleting");
+ g_message("TODO: determine whether still need to block changes while
deleting");
// /* Deafen the coverart display while deletion is occurring */
// coverart_block_change(TRUE);
@@ -2009,7 +2009,7 @@ void delete_track_ok(struct DeleteData *dd) {
}
/* Awaken coverart selection */
- g_warning("TODO: determine whether still need to block changes while
deleting");
+ g_message("TODO: determine whether still need to block changes while
deleting");
// coverart_block_change(FALSE);
g_list_free(dd->tracks);
g_free(dd);
diff --git a/src/prefs.c b/src/prefs.c
index 5603731..2349f9a 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -201,11 +201,11 @@ static void set_default_preferences()
prefs_set_string ("path_play_now", "xmms %s");
prefs_set_string ("path_play_enqueue", "xmms -e %s");
prefs_set_string ("path_mserv_trackinfo_root",
"/var/lib/mserv/trackinfo/");
- g_warning("TODO preferences should have no knowledge of cover art\n");
+ g_message("TODO preferences should have no knowledge of cover art\n");
// prefs_set_string ("coverart_display_bg_color", "#000000");
// prefs_set_string ("coverart_display_fg_color", "#FFFFFF");
- g_warning("TODO preferences should have no knowledge of music types\n");
+ g_message("TODO preferences should have no knowledge of music types\n");
// str = g_build_filename (SCRIPTDIR, "convert-ogg2mp3.sh", NULL);
// prefs_set_string ("path_conv_ogg", str);
// g_free (str);
@@ -221,7 +221,7 @@ static void set_default_preferences()
// g_free (str);
// prefs_set_int ("convert_wav", FALSE);
- g_warning("TODO preferences should have no knowledge of the sort tabs\n");
+ g_message("TODO preferences should have no knowledge of the sort tabs\n");
// /* Set sorting tab defaults */
// for (i = 0; i < SORT_TAB_MAX; i++)
// {
@@ -266,7 +266,7 @@ static void set_default_preferences()
prefs_set_int("horizontal_scrollbar", TRUE);
prefs_set_int("filter_tabs_top", FALSE);
- g_warning ("TODO preferences should have no knowledge of paned
positions\n");
+ g_message("TODO preferences should have no knowledge of paned
positions\n");
// /* Set pane positions--Let gtk worry about position */
// for (i = 0; i < PANED_NUM; i++)
// prefs_set_int_index("paned_pos_", i, -1);
@@ -334,7 +334,7 @@ static void set_default_preferences()
else
prefs_set_string("last_dir_browsed", g_get_home_dir());
- g_warning("TODO each pane will worry about its own sorting\n");
+ g_message("TODO each pane will worry about its own sorting\n");
// /* Set sorting prefs */
// prefs_set_int("case_sensitive", FALSE);
// prefs_set_int("tm_autostore", FALSE);
@@ -1077,7 +1077,7 @@ static void cleanup_keys()
prefs_set_string("filename_format", NULL);
prefs_set_string("write_extended_info", NULL);
- g_warning("TODO prefs have no knowledge of sort tabs\n");
+ g_message("TODO prefs have no knowledge of sort tabs\n");
// /* sp_created_cond renamed to sp_added_cond */
// for (i = 0; i < SORT_TAB_MAX; i++)
// {
@@ -1108,7 +1108,7 @@ static void cleanup_keys()
}
}
- g_warning("TODO prefs have no knowledge of panes\n");
+ g_message("TODO prefs have no knowledge of panes\n");
// /* handle version changes in prefs */
// if (version == 0.0)
// {
diff --git a/src/sha1.c b/src/sha1.c
index 19e7651..acfe76a 100644
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -93,7 +93,7 @@ void setup_sha1()
{
struct itdbs_head *itdbs_head;
- g_warning("TODO find other way of getting itdbs_head\n");
+ g_message("TODO find other way of getting itdbs_head\n");
itdbs_head = gp_get_itdbs_head();
/* gets called before itdbs are set up -> fail silently */
diff --git a/src/sort_window.c b/src/sort_window.c
index 88ed0d5..705001d 100644
--- a/src/sort_window.c
+++ b/src/sort_window.c
@@ -483,7 +483,7 @@ static void sort_window_set ()
compare_string_fuzzy_generate_keys ();
/* if case sensitive has changed, rebuild sortkeys */
- g_warning("TODO - send signal to initiate sort on apply of sort window");
+ g_message("TODO - send signal to initiate sort on apply of sort window");
// if (temp_prefs_get_int_value(sort_temp_prefs, "case_sensitive", &val))
// {
// st_rebuild_sortkeys ();
diff --git a/src/tools.c b/src/tools.c
index 60c7112..bef5680 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -421,7 +421,7 @@ void nm_tracks_list (GList *list)
else
{
/* we need ***much*** longer timeout */
- g_warning("TODO tools:nm_tracks_list - statusbar\n");
+ g_message("TODO tools:nm_tracks_list - statusbar\n");
// gtkpod_statusbar_timeout (30*STATUSBAR_TIMEOUT);
}
while (!abort && (list!=NULL))
@@ -431,7 +431,7 @@ void nm_tracks_list (GList *list)
gtk_label_set_text (GTK_LABEL (track_label), label_buf);
- g_warning("TODO tools:nm_tracks_list - statusbar\n");
+ g_message("TODO tools:nm_tracks_list - statusbar\n");
// gtkpod_statusbar_message (_("%s - %s"),
// track->artist, track->title);
C_FREE (label_buf);
@@ -524,7 +524,7 @@ void nm_tracks_list (GList *list)
list=g_list_next(list);
} /*end while*/
- g_warning("TODO tools:nm_tracks_list - statusbar\n");
+ g_message("TODO tools:nm_tracks_list - statusbar\n");
// gtkpod_statusbar_timeout (0);
// gtkpod_statusbar_message (ngettext ("Normalized %d of %d tracks.",
@@ -751,7 +751,7 @@ do_command_on_entries (const gchar *command, const gchar
*what,
if ((!command) || (strlen (command) == 0))
{
- g_warning("TODO tools:do_command_on_entries - statusbar\n");
+ g_message("TODO tools:do_command_on_entries - statusbar\n");
// gtkpod_statusbar_message (_("No command set for '%s'"), what);
return;
}
@@ -772,7 +772,7 @@ do_command_on_entries (const gchar *command, const gchar
*what,
commandc = g_find_program_in_path (str);
if (!commandc)
{
- g_warning("TODO tools:do_command_on_entries - statusbar\n");
+ g_message("TODO tools:do_command_on_entries - statusbar\n");
// gtkpod_statusbar_message (_("Could not find command '%s' specified for
'%s'"),
// str, what);
g_free (str);
@@ -884,7 +884,7 @@ on_gtkpod_info_delete_event (GtkWidget
*widget,
GdkEvent *event,
gpointer user_data)
{
- g_warning("TODO tools:on_gtkpod_info_delete_event - close_info_dialog\n");
+ g_message("TODO tools:on_gtkpod_info_delete_event - close_info_dialog\n");
// close_info_dialog ();
return TRUE; /* don't close again -- info_close_window() already does it */
}
@@ -894,6 +894,6 @@ G_MODULE_EXPORT void
on_info_close_clicked (GtkButton *button,
gpointer user_data)
{
- g_warning("TODO tools:on_info_close_clicked - close_info_dialog\n");
+ g_message("TODO tools:on_info_close_clicked - close_info_dialog\n");
// close_info_dialog ();
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
