commit b8416d49ed6cf0487ef22d96014b83321905dc4d
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Thu Nov 3 20:52:57 2011 +0000
Remove minor warnings
* Sorts out the GtkPodSortType enum comparison warnings with GtkSortType
* Removes unused variables
plugins/clarity/clarity_preview.c | 4 ----
plugins/cover_display/display_coverart.c | 6 +++---
plugins/coverweb/coverweb_preferences.c | 2 --
plugins/filetype_flac/flacfile.c | 6 ------
plugins/filetype_mp3/mp3file.c | 2 --
plugins/filetype_mp4/mp4file.c | 4 ----
plugins/playlist_display/display_playlists.c | 11 +++++++----
plugins/repository_editor/repository_editor.c | 6 +-----
plugins/sorttab_display/display_sorttabs.c | 10 +++-------
plugins/track_display/display_tracks.c | 12 ++++--------
plugins/track_display/rb_cell_renderer_rating.c | 4 ----
11 files changed, 18 insertions(+), 49 deletions(-)
---
diff --git a/plugins/clarity/clarity_preview.c
b/plugins/clarity/clarity_preview.c
index f61b3b1..1a798ec 100644
--- a/plugins/clarity/clarity_preview.c
+++ b/plugins/clarity/clarity_preview.c
@@ -47,10 +47,6 @@ struct _ClarityPreviewPrivate {
};
static void clarity_preview_class_init(ClarityPreviewClass *klass) {
- GObjectClass *gobject_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
-
g_type_class_add_private(klass, sizeof(ClarityPreviewPrivate));
}
diff --git a/plugins/cover_display/display_coverart.c
b/plugins/cover_display/display_coverart.c
index 6e08fb9..f981817 100644
--- a/plugins/cover_display/display_coverart.c
+++ b/plugins/cover_display/display_coverart.c
@@ -71,7 +71,7 @@ static gboolean
dnd_coverart_drag_motion(GtkWidget *widget, GdkDragContext *dc, gint x, gint
y, guint time, gpointer user_data);
static void set_cover_dimensions(Cover_Item *cover, int cover_index, gdouble
img_width, gdouble img_height);
-static void coverart_sort_images(GtkSortType order);
+static void coverart_sort_images(enum GtkPodSortTypes order);
static void set_slider_range(gint index);
static GdkRGBA *convert_hexstring_to_rgba(const gchar *hexstring);
static gboolean on_drawing_area_drawn(GtkWidget *draw_area, cairo_t
*cairo_draw_context, gpointer data);
@@ -1565,7 +1565,7 @@ static gint compare_album_keys(gchar *a, gchar *b) {
* @order: order type
*
*/
-static void coverart_sort_images(GtkSortType order) {
+static void coverart_sort_images(enum GtkPodSortTypes order) {
if (order == SORT_NONE) {
/* No sorting means original order so this should have been called
after a coverart_display_update (TRUE)
* when the TRUE means the tracks were freshly established from the
playlist and the hash and key_list
@@ -1577,7 +1577,7 @@ static void coverart_sort_images(GtkSortType order) {
album_key_list = g_list_sort(album_key_list, (GCompareFunc)
compare_album_keys);
}
- if (order == GTK_SORT_DESCENDING) {
+ if (order == SORT_DESCENDING) {
album_key_list = g_list_reverse(album_key_list);
}
}
diff --git a/plugins/coverweb/coverweb_preferences.c
b/plugins/coverweb/coverweb_preferences.c
index 5552427..3f85502 100644
--- a/plugins/coverweb/coverweb_preferences.c
+++ b/plugins/coverweb/coverweb_preferences.c
@@ -90,13 +90,11 @@ static gboolean tree_get_current_iter (GtkTreeView *view,
GtkTreeIter *iter)
static void save_bookmarks_preferences() {
g_return_if_fail(bookmarks_view);
GtkTreeModel *model;
- GtkListStore *store;
GtkTreeIter iter;
gint row = 0;
gboolean valid;
model = gtk_tree_view_get_model (GTK_TREE_VIEW(bookmarks_view));
- store = GTK_LIST_STORE(model);
valid = gtk_tree_model_get_iter_first (model, &iter);
while (valid) {
diff --git a/plugins/filetype_flac/flacfile.c b/plugins/filetype_flac/flacfile.c
index fc72411..87be12b 100644
--- a/plugins/filetype_flac/flacfile.c
+++ b/plugins/filetype_flac/flacfile.c
@@ -59,8 +59,6 @@ Track *flac_get_file_info(const gchar *flacFileName, GError
**error) {
g_free(filename);
}
else {
- gboolean flac_metadata_ok = FALSE;
-
track = gp_track_new();
track->mediatype = ITDB_MEDIATYPE_AUDIO;
@@ -74,10 +72,6 @@ Track *flac_get_file_info(const gchar *flacFileName, GError
**error) {
else {
gint i;
- if (tags->data.vorbis_comment.num_comments > 0) {
- flac_metadata_ok = TRUE;
- }
-
for (i = 0; i < tags->data.vorbis_comment.num_comments; i++) {
gchar *tag = (gchar*)
tags->data.vorbis_comment.comments[i].entry;
diff --git a/plugins/filetype_mp3/mp3file.c b/plugins/filetype_mp3/mp3file.c
index 955474c..2e2bffe 100644
--- a/plugins/filetype_mp3/mp3file.c
+++ b/plugins/filetype_mp3/mp3file.c
@@ -423,13 +423,11 @@ void get_mp3_info(MP3Info *mp3) {
gint counter = 0;
MP3Header header;
struct stat filestat;
- off_t data_start = 0;
stat(mp3->filename, &filestat);
mp3->datasize = filestat.st_size;
if (get_first_header(mp3, 0L)) {
- data_start = ftell(mp3->file);
while ((bitrate = get_next_header(mp3))) {
if (bitrate < 15) /* sanity added by JCS */
frame_type[15 - bitrate]++;
diff --git a/plugins/filetype_mp4/mp4file.c b/plugins/filetype_mp4/mp4file.c
index 731007d..b18a513 100644
--- a/plugins/filetype_mp4/mp4file.c
+++ b/plugins/filetype_mp4/mp4file.c
@@ -451,7 +451,6 @@ static gboolean mp4_get_apple_uint8_property(MP4FileHandle
hFile, const char* pr
u_int8_t *value;
guint32 valuelen;
guint32 class_flag;
- guint8 atom_version;
gboolean success = FALSE;
success = MP4GetBytesProperty(hFile, propName, &value, &valuelen);
@@ -461,7 +460,6 @@ static gboolean mp4_get_apple_uint8_property(MP4FileHandle
hFile, const char* pr
pos += 8; /* Skip over the length and the atom name */
/* pos now points to a 1-byte atom version followed by a 3-byte
class/flag field */
- atom_version = *pos;
class_flag = GUINT32_FROM_BE(*(guint32*)pos) & 0x00ffffff;
if (class_flag == 21 || class_flag == 0) {
pos += 4; /* Skip over the atom version and class/flag */
@@ -481,7 +479,6 @@ static gboolean mp4_get_apple_text_property(MP4FileHandle
hFile, const char* pro
u_int8_t *value;
guint32 valuelen;
guint32 class_flag;
- guint8 atom_version;
gboolean success = FALSE;
success = MP4GetBytesProperty(hFile, propName, &value, &valuelen);
@@ -490,7 +487,6 @@ static gboolean mp4_get_apple_text_property(MP4FileHandle
hFile, const char* pro
pos = value;
pos += 8; /* Skip over the length and the atom name */
/* pos now points to a 1-byte atom version followed by a 3-byte
class/flag field */
- atom_version = *pos;
class_flag = GUINT32_FROM_BE(*(guint32*)pos) & 0x00ffffff;
if (class_flag == 1) {
pos += 4; /* Skip over the atom version and class/flag */
diff --git a/plugins/playlist_display/display_playlists.c
b/plugins/playlist_display/display_playlists.c
index 208ad91..e13c579 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -1376,7 +1376,7 @@ static void pm_unsort() {
}
/* Set the sorting accordingly */
-void pm_sort(GtkSortType order) {
+void pm_sort(enum GtkPodSortTypes order) {
GtkTreeModel *model = gtk_tree_view_get_model(playlist_treeview);
g_return_if_fail (model);
if (order != SORT_NONE) {
@@ -1468,16 +1468,19 @@ void pm_rows_reordered(void) {
gint pm_data_compare_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
gpointer user_data) {
Playlist *playlist1 = NULL;
Playlist *playlist2 = NULL;
- GtkSortType order;
+ enum GtkPodSortTypes order;
gint corr, colid;
g_return_val_if_fail (model, 0);
g_return_val_if_fail (a, 0);
g_return_val_if_fail (b, 0);
- if (gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE (model),
&colid, &order) == FALSE)
+ GtkSortType sortorder;
+ if (gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE (model),
&colid, &sortorder) == FALSE)
return 0;
+ order = (enum GtkPodSortTypes) sortorder;
+
if (order == SORT_NONE)
return 0;
@@ -1487,7 +1490,7 @@ gint pm_data_compare_func(GtkTreeModel *model,
GtkTreeIter *a, GtkTreeIter *b, g
g_return_val_if_fail (playlist1 && playlist2, 0);
/* We make sure that the master playlist always stays on top */
- if (order == GTK_SORT_ASCENDING)
+ if (order == SORT_ASCENDING)
corr = +1;
else
corr = -1;
diff --git a/plugins/repository_editor/repository_editor.c
b/plugins/repository_editor/repository_editor.c
index 51fca5e..097a3fb 100644
--- a/plugins/repository_editor/repository_editor.c
+++ b/plugins/repository_editor/repository_editor.c
@@ -351,7 +351,7 @@ gchar *fileselection_select_script(const gchar *opath,
const gchar *fallback, co
/* Render apply insensitive when no changes were made.
When an itdb is marked for deletion, make entries insensitive */
static void update_buttons() {
- gboolean apply, ok, deleted;
+ gboolean apply, deleted;
gchar *key;
g_return_if_fail (repository_view);
@@ -360,11 +360,9 @@ static void update_buttons() {
if ((temp_prefs_size(repository_view->temp_prefs) > 0) ||
(temp_prefs_size(repository_view->extra_prefs) > 0)) {
apply = TRUE;
- ok = TRUE;
}
else {
apply = FALSE;
- ok = TRUE;
}
gtk_widget_set_sensitive(GET_WIDGET (repository_view->builder,
APPLY_BUTTON), apply);
@@ -1208,7 +1206,6 @@ static void display_repository_info() {
static void display_playlist_info() {
gchar *buf, *key;
Playlist *playlist;
- iTunesDB *itdb;
gint i, index;
const gchar *widget_names[] =
{
@@ -1230,7 +1227,6 @@ static void display_playlist_info() {
g_return_if_fail (repository_view->playlist);
/* for convenience */
- itdb = repository_view->itdb;
index = repository_view->itdb_index;
playlist = repository_view->playlist;
diff --git a/plugins/sorttab_display/display_sorttabs.c
b/plugins/sorttab_display/display_sorttabs.c
index 72b4524..5db6f52 100644
--- a/plugins/sorttab_display/display_sorttabs.c
+++ b/plugins/sorttab_display/display_sorttabs.c
@@ -374,13 +374,11 @@ static TimeInfo *sp_get_timeinfo_ptr(guint32 inst, T_item
item) {
/* Return value: pointer to the corresponding TimeInfo struct (for
convenience) or NULL if error occurred */
static TimeInfo *sp_update_date_interval_from_string(guint32 inst, T_item
item, gboolean force_update) {
- SortTab *st;
TimeInfo *ti;
if (inst >= SORT_TAB_MAX)
return NULL;
- st = sorttab[inst];
ti = sp_get_timeinfo_ptr(inst, item);
if (ti) {
@@ -1059,7 +1057,7 @@ static void st_free_entry_cb(gpointer data, gpointer
user_data) {
void st_remove_all_entries_from_model(guint32 inst) {
SortTab *st = sorttab[inst];
gint column;
- enum GtkPodSortTypes order;
+ GtkSortType sortorder;
if (st) {
if (st->current_entry) {
@@ -1079,7 +1077,7 @@ void st_remove_all_entries_from_model(guint32 inst) {
st->entry_hash = NULL;
if ((prefs_get_int("st_sort") == SORT_NONE)
- && gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE
(st->model), &column, &order)) { /* recreate track treeview to unset sorted
column */
+ && gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE
(st->model), &column, &sortorder)) { /* recreate track treeview to unset sorted
column */
if (column >= 0) {
st_create_notebook(inst);
}
@@ -1751,7 +1749,7 @@ void st_redisplay(guint32 inst) {
}
/* Start sorting */
-static void st_sort_inst(guint32 inst, GtkSortType order) {
+static void st_sort_inst(guint32 inst, enum GtkPodSortTypes order) {
if (inst < prefs_get_int("sort_tab_num")) {
SortTab *st = sorttab[inst];
if (st) {
@@ -3223,7 +3221,6 @@ void cal_open_calendar(gint inst, T_item item) {
/* return value: -1: user selected cancel
0...prefs_get_sort_tab_number()-1: selected tab */
gint st_get_sort_tab_number(gchar *text) {
- static gint last_nr = 1;
GtkWidget *mdialog;
GtkDialog *dialog;
GtkWidget *combo;
@@ -3276,7 +3273,6 @@ gint st_get_sort_tab_number(gchar *text) {
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &bufp, -1);
if (bufp) {
nr = atoi(bufp) - 1;
- last_nr = nr + 1;
g_free(bufp);
} else {
nr = -1; /* selection failed */
diff --git a/plugins/track_display/display_tracks.c
b/plugins/track_display/display_tracks.c
index ad69b22..57ca1f6 100644
--- a/plugins/track_display/display_tracks.c
+++ b/plugins/track_display/display_tracks.c
@@ -369,7 +369,6 @@ static void tm_drag_leave(GtkWidget *widget, GdkDragContext
*dc, guint time, gpo
}
static gboolean tm_drag_motion(GtkWidget *widget, GdkDragContext *dc, gint x,
gint y, guint time, gpointer user_data) {
- GtkTreeView *treeview;
GdkAtom target;
GtkTreePath *path = NULL;
GtkTreeViewDropPosition pos;
@@ -383,8 +382,6 @@ static gboolean tm_drag_motion(GtkWidget *widget,
GdkDragContext *dc, gint x, gi
g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
- treeview = GTK_TREE_VIEW (widget);
-
gp_install_autoscroll_row_timeout(widget);
itdb = gp_get_selected_itdb();
@@ -486,7 +483,6 @@ static void tm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
GtkTreePath *path = NULL;
GtkTreeModel *model = NULL;
GtkTreeViewDropPosition pos = 0;
- gboolean result = FALSE;
/* printf ("sm drop received info: %d\n", info); */
@@ -543,12 +539,12 @@ static void tm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
switch (info) {
case DND_GTKPOD_TM_PATHLIST:
g_return_if_fail (path);
- result = tm_move_pathlist(data_copy, path, pos);
+ tm_move_pathlist(data_copy, path, pos);
gdk_drag_status(dc, GDK_ACTION_MOVE, time);
gtk_drag_finish(dc, TRUE, FALSE, time);
break;
case DND_TEXT_PLAIN:
- result = tm_add_filelist(data_copy, path, pos);
+ tm_add_filelist(data_copy, path, pos);
gdk_drag_status(dc, gdk_drag_context_get_suggested_action(dc), time);
if (gdk_drag_context_get_selected_action(dc) == GDK_ACTION_MOVE)
gtk_drag_finish(dc, TRUE, TRUE, time);
@@ -556,7 +552,7 @@ static void tm_drag_data_received(GtkWidget *widget,
GdkDragContext *dc, gint x,
gtk_drag_finish(dc, TRUE, FALSE, time);
break;
case DND_TEXT_URI_LIST:
- result = tm_add_filelist(data_copy, path, pos);
+ tm_add_filelist(data_copy, path, pos);
gdk_drag_status(dc, gdk_drag_context_get_suggested_action(dc), time);
if (gdk_drag_context_get_selected_action(dc) == GDK_ACTION_MOVE)
gtk_drag_finish(dc, TRUE, TRUE, time);
@@ -1746,7 +1742,7 @@ static void tm_sort_column_changed(GtkTreeSortable *ts,
gpointer user_data) {
g_list_free(tracks);
}
-void tm_sort(TM_item col, GtkSortType order) {
+void tm_sort(TM_item col, enum GtkPodSortTypes order) {
if (track_treeview) {
GtkTreeModel *model = gtk_tree_view_get_model(track_treeview);
diff --git a/plugins/track_display/rb_cell_renderer_rating.c
b/plugins/track_display/rb_cell_renderer_rating.c
index 183e3d7..7d9bd2a 100644
--- a/plugins/track_display/rb_cell_renderer_rating.c
+++ b/plugins/track_display/rb_cell_renderer_rating.c
@@ -183,10 +183,6 @@ rb_cell_renderer_rating_class_init
(RBCellRendererRatingClass *class)
static void
rb_cell_renderer_rating_finalize (GObject *object)
{
- RBCellRendererRating *cellrating;
-
- cellrating = RB_CELL_RENDERER_RATING (object);
-
G_OBJECT_CLASS (rb_cell_renderer_rating_parent_class)->finalize
(object);
}
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
