Mercurial > audlegacy
changeset 4640:cbc9965e1552
removed some dangling white spaces.
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Fri, 13 Jun 2008 22:32:27 +0900 |
| parents | 0813d0d66627 |
| children | aeb435ee43f8 |
| files | src/audacious/playback.c src/audacious/pluginenum.c src/audacious/tuple.c |
| diffstat | 3 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/playback.c Fri Jun 13 08:19:29 2008 +0300 +++ b/src/audacious/playback.c Fri Jun 13 22:32:27 2008 +0900 @@ -124,7 +124,7 @@ g_return_val_if_fail(playback_get_playing(), -1); playback = get_current_input_playback(); - if (!playback) /* playback can be NULL during init even if playing is TRUE */ + if (!playback) /* playback can be NULL during init even if playing is TRUE */ return -1; plugin_set_current((Plugin *)(playback->plugin)); if (playback->plugin->get_time) @@ -134,7 +134,7 @@ } if (playback->error) return -2; - if (!playback->playing || + if (!playback->playing || (playback->eof && !playback->output->buffer_playing())) return -1; return playback->output->output_time();
--- a/src/audacious/pluginenum.c Fri Jun 13 08:19:29 2008 +0300 +++ b/src/audacious/pluginenum.c Fri Jun 13 22:32:27 2008 +0900 @@ -102,7 +102,7 @@ .vfs_buffered_file_new_from_uri = vfs_buffered_file_new_from_uri, .vfs_buffered_file_release_live_fd = vfs_buffered_file_release_live_fd, - + .vfs_fget_le16 = vfs_fget_le16, .vfs_fget_le32 = vfs_fget_le32, .vfs_fget_le64 = vfs_fget_le64, @@ -370,7 +370,7 @@ .volumecontrol_flow = volumecontrol_flow, .util_menu_main_show = util_menu_main_show, - + .get_output_list = get_output_list, .input_get_volume = input_get_volume, @@ -541,7 +541,7 @@ p->get_vis_type = input_get_vis_type; p->add_vis_pcm = input_add_vis_pcm; - + /* Pretty const casts courtesy of XMMS's plugin.h legacy. Anyone else thinks we could use a CONST macro to solve the warnings? - descender */ @@ -549,7 +549,7 @@ p->set_info_text = input_set_info_text; ip_data.input_list = g_list_append(ip_data.input_list, p); - + p->enabled = TRUE; /* XXX: we need something better than p->filename if plugins @@ -578,7 +578,7 @@ output_plugin_init(Plugin * plugin) { OutputPlugin *p = OUTPUT_PLUGIN(plugin); - op_data.output_list = g_list_append(op_data.output_list, p); + op_data.output_list = g_list_append(op_data.output_list, p); mowgli_dictionary_add(plugin_dict, g_basename(p->filename), p); } @@ -751,7 +751,7 @@ g_message("Loaded plugin (%s)", filename); if (!(module = g_module_open(filename, G_MODULE_BIND_LOCAL))) { - printf("Failed to load plugin (%s): %s\n", + printf("Failed to load plugin (%s): %s\n", filename, g_module_error()); return; } @@ -1012,7 +1012,7 @@ if (op->handle) g_module_close(op->handle); } - + if (op_data.output_list != NULL) { g_list_free(op_data.output_list);
--- a/src/audacious/tuple.c Fri Jun 13 08:19:29 2008 +0300 +++ b/src/audacious/tuple.c Fri Jun 13 22:32:27 2008 +0900 @@ -108,15 +108,15 @@ for (i = 0; i < FIELD_LAST; i++) if (tuple->values[i]) { TupleValue *value = tuple->values[i]; - + if (value->type == TUPLE_STRING) g_free(value->value.string); - + mowgli_heap_free(tuple_value_heap, value); } - + g_free(tuple->subtunes); - + mowgli_heap_free(tuple_heap, tuple); TUPLE_UNLOCK_WRITE(); } @@ -127,7 +127,7 @@ Tuple *tuple; TUPLE_LOCK_WRITE(); - + if (tuple_heap == NULL) { tuple_heap = mowgli_heap_create(sizeof(Tuple), 512, BH_NOW); @@ -181,7 +181,7 @@ _tuple_associate_raw_string(tuple, FIELD_FILE_PATH, NULL, uri_to_display_basename(filename)); - + ext = strrchr(filename, '.'); if (ext != NULL) { ++ext; @@ -190,7 +190,7 @@ } return tuple; -} +} static gint tuple_get_nfield(const gchar *field) @@ -209,7 +209,7 @@ const gchar *tfield = field; gint nfield = cnfield; TupleValue *value = NULL; - + g_return_val_if_fail(tuple != NULL, NULL); g_return_val_if_fail(cnfield < FIELD_LAST, NULL); @@ -225,7 +225,7 @@ if (nfield >= 0) { tfield = tuple_fields[nfield].name; value = tuple->values[nfield]; - + if (ftype != tuple_fields[nfield].type) { /* FIXME! Convert values perhaps .. or not? */ fprintf(stderr, "Invalid type for [%s](%d->%d), %d != %d\n", tfield, cnfield, nfield, ftype, tuple_fields[nfield].type); @@ -236,7 +236,7 @@ } else { value = mowgli_dictionary_retrieve(tuple->dict, tfield); } - + if (value != NULL) { /* Value exists, just delete old associated data */ if (value->type == TUPLE_STRING) { @@ -278,13 +278,13 @@ tuple_associate_int(Tuple *tuple, const gint nfield, const gchar *field, gint integer) { TupleValue *value; - + TUPLE_LOCK_WRITE(); if ((value = tuple_associate_data(tuple, nfield, field, TUPLE_INT)) == NULL) return FALSE; value->value.integer = integer; - + TUPLE_UNLOCK_WRITE(); return TRUE; } @@ -314,7 +314,7 @@ TUPLE_UNLOCK_WRITE(); return; } - + /* Free associated data */ if (value->type == TUPLE_STRING) { g_free(value->value.string); @@ -336,7 +336,7 @@ if (nfield < 0) nfield = tuple_get_nfield(field); - + TUPLE_LOCK_READ(); if (nfield < 0) { TupleValue *value; @@ -346,7 +346,7 @@ if (tuple->values[nfield]) type = tuple->values[nfield]->type; } - + TUPLE_UNLOCK_READ(); return type; } @@ -362,7 +362,7 @@ if (nfield < 0) nfield = tuple_get_nfield(field); - + TUPLE_LOCK_READ(); if (nfield < 0) value = mowgli_dictionary_retrieve(tuple->dict, field); @@ -372,7 +372,7 @@ if (value) { if (value->type != TUPLE_STRING) mowgli_throw_exception_val(audacious.tuple.invalid_type_request, NULL); - + TUPLE_UNLOCK_READ(); return value->value.string; } else { @@ -392,7 +392,7 @@ if (nfield < 0) nfield = tuple_get_nfield(field); - + TUPLE_LOCK_READ(); if (nfield < 0) value = mowgli_dictionary_retrieve(tuple->dict, field); @@ -402,7 +402,7 @@ if (value) { if (value->type != TUPLE_INT) mowgli_throw_exception_val(audacious.tuple.invalid_type_request, 0); - + TUPLE_UNLOCK_READ(); return value->value.integer; } else {