# HG changeset patch # User Giacomo Lozito # Date 1186827690 -7200 # Node ID db616ccdd40c6a302dac1d5d1984c0f9382f2992 # Parent a19e4395eaff236d8b67877446286e84d367ee77 use tuple_free(x) in place of mowgli_object_unref(x) diff -r a19e4395eaff -r db616ccdd40c src/aac/src/libmp4.c --- a/src/aac/src/libmp4.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/aac/src/libmp4.c Sat Aug 11 12:21:30 2007 +0200 @@ -462,7 +462,7 @@ title = tuple_formatter_process_string(tuple, cfg.gentitle_format); - mowgli_object_unref(tuple); + tuple_free(tuple); return title; } diff -r a19e4395eaff -r db616ccdd40c src/console/Audacious_Driver.cxx --- a/src/console/Audacious_Driver.cxx Sat Aug 11 12:10:33 2007 +0200 +++ b/src/console/Audacious_Driver.cxx Sat Aug 11 12:21:30 2007 +0200 @@ -242,7 +242,7 @@ char* result = tuple_formatter_process_string(ti, cfg.gentitle_format); if ( result ) *length = tuple_get_int(ti, "length"); - mowgli_object_unref((void *) ti); + tuple_free((void *) ti); return result; } diff -r a19e4395eaff -r db616ccdd40c src/cue/cuesheet.c --- a/src/cue/cuesheet.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/cue/cuesheet.c Sat Aug 11 12:21:30 2007 +0200 @@ -295,7 +295,7 @@ tuple_associate_int(out, "length", tuple_get_int(phys_tuple, "length")); - mowgli_object_unref(phys_tuple); + tuple_free(phys_tuple); tuple_associate_string(out, "title", cue_tracks[track].title); tuple_associate_string(out, "artist", cue_tracks[track].performer ? @@ -327,7 +327,7 @@ *title = tuple_formatter_process_string(tuple, cfg.gentitle_format); *length = tuple_get_int(tuple, "length"); - mowgli_object_unref(tuple); + tuple_free(tuple); } static void seek(InputPlayback * data, gint time) diff -r a19e4395eaff -r db616ccdd40c src/flacng/tools.c --- a/src/flacng/tools.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/flacng/tools.c Sat Aug 11 12:21:30 2007 +0200 @@ -286,7 +286,7 @@ title = tuple_formatter_process_string(input, cfg.gentitle_format); - mowgli_object_unref(input); + tuple_free(input); _DEBUG("Title created: <%s>", title); diff -r a19e4395eaff -r db616ccdd40c src/madplug/decoder.c --- a/src/madplug/decoder.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/madplug/decoder.c Sat Aug 11 12:21:30 2007 +0200 @@ -708,7 +708,7 @@ g_message("e: decode"); #endif /* DEBUG */ - mowgli_object_unref(info->tuple); + tuple_free(info->tuple); info->tuple = NULL; info->playback->output->close_audio(); diff -r a19e4395eaff -r db616ccdd40c src/madplug/input.c --- a/src/madplug/input.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/madplug/input.c Sat Aug 11 12:21:30 2007 +0200 @@ -664,7 +664,7 @@ g_free(info->mp3gain_minmax_str); if (info->tuple) { - mowgli_object_unref(info->tuple); + tuple_free(info->tuple); info->tuple = NULL; } diff -r a19e4395eaff -r db616ccdd40c src/musepack/libmpc.cxx --- a/src/musepack/libmpc.cxx Sat Aug 11 12:10:33 2007 +0200 +++ b/src/musepack/libmpc.cxx Sat Aug 11 12:21:30 2007 +0200 @@ -739,7 +739,7 @@ if (!*title) title = g_strdup(tuple_get_string(tuple, "file-name")); - mowgli_object_unref((void *) tuple); + tuple_free((void *) tuple); return title; } diff -r a19e4395eaff -r db616ccdd40c src/scrobbler/scrobbler.c --- a/src/scrobbler/scrobbler.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/scrobbler/scrobbler.c Sat Aug 11 12:21:30 2007 +0200 @@ -889,7 +889,7 @@ item = q_put(tuple, atoi(len)); - mowgli_object_unref(tuple); + tuple_free(tuple); } pdebug(fmt_vastr("a[%d]=%s t[%d]=%s l[%d]=%s i[%d]=%s m[%d]=%s b[%d]=%s", diff -r a19e4395eaff -r db616ccdd40c src/sexypsf/plugin.c --- a/src/sexypsf/plugin.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/sexypsf/plugin.c Sat Aug 11 12:21:30 2007 +0200 @@ -252,7 +252,7 @@ if (tuple != NULL) { title = tuple_formatter_process_string(tuple, cfg.gentitle_format); - mowgli_object_unref(tuple); + tuple_free(tuple); } else title = g_path_get_basename(fn); diff -r a19e4395eaff -r db616ccdd40c src/timidity/src/xmms-timidity.c --- a/src/timidity/src/xmms-timidity.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/timidity/src/xmms-timidity.c Sat Aug 11 12:21:30 2007 +0200 @@ -314,7 +314,7 @@ if (title == NULL || *title == '\0') title = g_strdup(tuple_get_string(input, "file-name")); - mowgli_object_unref(input); + tuple_free(input); return title; } diff -r a19e4395eaff -r db616ccdd40c src/tta/libtta.c --- a/src/tta/libtta.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/tta/libtta.c Sat Aug 11 12:21:30 2007 +0200 @@ -193,7 +193,7 @@ *title = get_song_title(tuple); } - mowgli_object_unref(tuple); + tuple_free(tuple); } static void * @@ -503,7 +503,7 @@ tuple = get_song_tuple(filename); title = get_song_title(tuple); - mowgli_object_unref(tuple); + tuple_free(tuple); datasize = file_size(filename) - info.DATAPOS; origsize = info.DATALENGTH * info.BSIZE * info.NCH; diff -r a19e4395eaff -r db616ccdd40c src/vorbis/vorbis.c --- a/src/vorbis/vorbis.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/vorbis/vorbis.c Sat Aug 11 12:21:30 2007 +0200 @@ -611,7 +611,7 @@ *title = tuple_formatter_process_string(tuple, vorbis_cfg.tag_override ? vorbis_cfg.tag_format : cfg.gentitle_format); - mowgli_object_unref(tuple); + tuple_free(tuple); } static const gchar * @@ -845,7 +845,7 @@ g_free(tmp); } - mowgli_object_unref(input); + tuple_free(input); return displaytitle; } diff -r a19e4395eaff -r db616ccdd40c src/vtx/vtx.c --- a/src/vtx/vtx.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/vtx/vtx.c Sat Aug 11 12:21:30 2007 +0200 @@ -241,7 +241,7 @@ g_free (buf); - mowgli_object_unref(ti); + tuple_free(ti); playback->playing = TRUE; play_thread = g_thread_self(); @@ -302,7 +302,7 @@ *length = tuple_get_int(ti, "length"); ayemu_vtx_free (&tmp); - mowgli_object_unref(ti); + tuple_free(ti); } } diff -r a19e4395eaff -r db616ccdd40c src/wav/wav.c --- a/src/wav/wav.c Sat Aug 11 12:10:33 2007 +0200 +++ b/src/wav/wav.c Sat Aug 11 12:21:30 2007 +0200 @@ -222,7 +222,7 @@ title = g_strdup(tuple_get_string(tuple, "file-name")); } - mowgli_object_unref(tuple); + tuple_free(tuple); return title; } diff -r a19e4395eaff -r db616ccdd40c src/wavpack/libwavpack.cxx --- a/src/wavpack/libwavpack.cxx Sat Aug 11 12:10:33 2007 +0200 +++ b/src/wavpack/libwavpack.cxx Sat Aug 11 12:21:30 2007 +0200 @@ -410,7 +410,7 @@ if (!displaytitle || *displaytitle == '\0') displaytitle = g_strdup(fn); - mowgli_object_unref((void *) ti); + tuple_free((void *) ti); return displaytitle; }