rendered paste body--- gmedialib/gmlbrowser.c 2007-01-17 11:18:11.000000000 -0600
+++ gmedialib/gmlbrowser.c 2007-01-31 15:03:06.000000000 -0600
@@ -160,9 +160,9 @@
gtk_tree_view_set_model(GTK_TREE_VIEW(gml->browser.list), NULL);
for (; xmmsc_result_list_valid(res); xmmsc_result_list_next(res)) {
- xmmsc_result_get_dict_entry_str(res, "artist", &artist);
- xmmsc_result_get_dict_entry_str(res, "album", &album);
- xmmsc_result_get_dict_entry_int32(res, "id", &id);
+ xmmsc_result_get_dict_entry_string(res, "artist", &artist);
+ xmmsc_result_get_dict_entry_string(res, "album", &album);
+ xmmsc_result_get_dict_entry_int(res, "id", &id);
if (!artist)
artist = "Unknown";
if (g_ascii_strcasecmp(artist, artist_tmp) != 0) {
--- gmedialib/gmlplaylist.c 2007-01-17 11:18:11.000000000 -0600
+++ gmedialib/gmlplaylist.c 2007-01-31 15:32:35.000000000 -0600
@@ -44,14 +44,14 @@
gint tracknr = -1, rating = -1;
static gchar last_title[256] = "", last_artist[256] = "";
- xmmsc_result_get_dict_entry_str (res, "artist", &artist_tmp);
- xmmsc_result_get_dict_entry_str (res, "title", &title_tmp);
- xmmsc_result_get_dict_entry_str (res, "album", &album);
- xmmsc_result_get_dict_entry_int32(res, "id", &id);
- xmmsc_result_get_dict_entry_str (res, "url", &url);
- xmmsc_result_get_dict_entry_int32(res, "tracknr", &tracknr);
- xmmsc_result_get_dict_entry_int32(res, "rating", &rating);
- if (xmmsc_result_get_dict_entry_str(res, "channel", &channel)) {
+ xmmsc_result_get_dict_entry_string (res, "artist", &artist_tmp);
+ xmmsc_result_get_dict_entry_string (res, "title", &title_tmp);
+ xmmsc_result_get_dict_entry_string (res, "album", &album);
+ xmmsc_result_get_dict_entry_int(res, "id", &id);
+ xmmsc_result_get_dict_entry_string (res, "url", &url);
+ xmmsc_result_get_dict_entry_int(res, "tracknr", &tracknr);
+ xmmsc_result_get_dict_entry_int(res, "rating", &rating);
+ if (xmmsc_result_get_dict_entry_string(res, "channel", &channel)) {
prefix = "[Stream] ";
album = channel;
} else if (album == NULL)
@@ -132,7 +132,7 @@
pos = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(gml->playlist.ls), NULL);
- xmmsc_result_get_dict_entry_int32(res2, "id", &id);
+ xmmsc_result_get_dict_entry_int(res2, "id", &id);
if (gml->playlist.ls != NULL) {
gtk_list_store_append(gml->playlist.ls, &iter);
@@ -209,7 +209,7 @@
{
xmmsc_result_t *res2;
- res2 = xmmsc_playlist_current_pos(connection);
+ res2 = xmmsc_playlist_current_pos(connection, NULL);
xmmsc_result_notifier_set(res2, n_pl_update_current_pos, userdata);
xmmsc_result_unref(res2);
}
@@ -235,10 +235,10 @@
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(gml->playlist.ls),
NULL);
- xmmsc_result_get_dict_entry_int32(res, "type", &signal);
+ xmmsc_result_get_dict_entry_int(res, "type", &signal);
switch (signal) {
case XMMS_PLAYLIST_CHANGED_ADD:
- xmmsc_result_get_dict_entry_uint32(res, "id", &id);
+ xmmsc_result_get_dict_entry_uint(res, "id", &id);
/* add item to gtk list */
if (gml->playlist.ls != NULL) {
@@ -249,8 +249,8 @@
}
break;
case XMMS_PLAYLIST_CHANGED_INSERT:
- xmmsc_result_get_dict_entry_uint32(res, "id", &id);
- xmmsc_result_get_dict_entry_int32(res, "position", &pos_ins);
+ xmmsc_result_get_dict_entry_uint(res, "id", &id);
+ xmmsc_result_get_dict_entry_int(res, "position", &pos_ins);
gtk_list_store_insert(gml->playlist.ls, &iter, pos_ins);
gtk_list_store_set(gml->playlist.ls, &iter,
0, pos_ins, 1, id, -1);
@@ -269,7 +269,7 @@
gml_pl_refresh_playlist(gml);
break;
case XMMS_PLAYLIST_CHANGED_REMOVE:
- xmmsc_result_get_dict_entry_int32(res, "position", &pos_del);
+ xmmsc_result_get_dict_entry_int(res, "position", &pos_del);
model = GTK_TREE_MODEL(gml->playlist.ls);
if (gtk_tree_model_get_iter_first(model, &iter)) {
@@ -333,7 +333,7 @@
{
xmmsc_result_t *res;
- res = xmmsc_playlist_current_pos(connection);
+ res = xmmsc_playlist_current_pos(connection, NULL);
xmmsc_result_notifier_set(res, n_pl_update_current_pos, gml);
xmmsc_result_unref(res);
}
@@ -554,7 +554,7 @@
g_list_foreach(list, (GFunc)gtk_tree_path_free, NULL);
g_list_free(list);
- res = xmmsc_playlist_move(connection, pos, pos + direction);
+ res = xmmsc_playlist_move_entry(connection, NULL, pos, pos + direction);
xmmsc_result_notifier_set(res, n_playlist_move, p);
xmmsc_result_unref(res);
}
@@ -584,7 +584,7 @@
xmmsc_result_t *res;
if (gml->playlist.refresh_counter == 0) {
- res = xmmsc_playlist_shuffle(connection);
+ res = xmmsc_playlist_shuffle(connection, NULL);
xmmsc_result_notifier_set(res, n_shuffle_or_sort_ready, userdata);
xmmsc_result_unref(res);
}
@@ -594,7 +594,7 @@
{
xmmsc_result_t *res;
- res = xmmsc_playlist_sort(connection, "artist");
+ res = xmmsc_playlist_sort(connection, "artist", NULL);
xmmsc_result_notifier_set(res, n_shuffle_or_sort_ready, userdata);
xmmsc_result_unref(res);
}
@@ -612,7 +612,7 @@
for (; xmmsc_result_list_valid(res); xmmsc_result_list_next(res)) {
gint32 id;
- xmmsc_result_get_dict_entry_int32(res, "id", &id);
+ xmmsc_result_get_dict_entry_int(res, "id", &id);
/* get playlist length */
pl_length =
@@ -620,7 +620,7 @@
NULL);
/* add id to playlist */
- res2 = xmmsc_playlist_add_id(connection, id);
+ res2 = xmmsc_playlist_add_id(connection, NULL, id);
xmmsc_result_unref(res2);
}
xmmsc_result_unref(res);
@@ -742,7 +742,7 @@
xmmsc_result_t *res;
guint pos = *(guint *)(element->data);
- res = xmmsc_playlist_remove(connection, pos);
+ res = xmmsc_playlist_remove_entry(connection, NULL, pos);
xmmsc_result_notifier_set(res, n_playlist_remove, NULL);
xmmsc_result_unref(res);
@@ -868,7 +868,7 @@
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(p->gml->playlist.ls),
&(p->iter))) {
- res = xmmsc_playlist_current_pos(connection);
+ res = xmmsc_playlist_current_pos(connection, NULL);
xmmsc_result_notifier_set(res, n_playlist_current_pos, p);
xmmsc_result_unref(res);
}
@@ -923,7 +923,7 @@
}
}
if (result != GTK_RESPONSE_REJECT) {
- res = xmmsc_playlist_clear(connection);
+ res = xmmsc_playlist_clear(connection, NULL);
xmmsc_result_notifier_set(res, n_playlist_clear, userdata);
xmmsc_result_unref(res);
}
@@ -964,14 +964,14 @@
gtk_widget_show_all(dialog);
result = gtk_dialog_run(GTK_DIALOG(dialog));
- if (result == GTK_RESPONSE_ACCEPT) {
- /* save the playlist */
+ /*if (result == GTK_RESPONSE_ACCEPT) {
+ save the playlist
res = xmmsc_medialib_playlist_save_current(connection,
gtk_entry_get_text(
GTK_ENTRY(entry)));
xmmsc_result_notifier_set(res, n_playlist_save, userdata);
xmmsc_result_unref(res);
- }
+ }*/
gtk_widget_destroy(dialog);
}
--- gmedialib/gmlplaylists.c 2007-01-17 11:18:11.000000000 -0600
+++ gmedialib/gmlplaylists.c 2007-01-31 15:08:30.000000000 -0600
@@ -35,7 +35,7 @@
gml_set_statusbar_text(p->gml, (gchar *)xmmsc_result_get_error(res));
} else {
gint cnt = 0;
- xmmsc_result_get_dict_entry_int32(res, "cnt", &cnt);
+ xmmsc_result_get_dict_entry_int(res, "cnt", &cnt);
/* Hide all lists that start with _ */
if (p->gml->playlists.ls != NULL && p->name[0] != '_') {
gtk_list_store_append(p->gml->playlists.ls, &iter);
@@ -65,8 +65,8 @@
gchar query[1024];
xmmsc_result_t *res2;
- xmmsc_result_get_dict_entry_str(res, "name", &name);
- xmmsc_result_get_dict_entry_int32(res, "id", &id);
+ xmmsc_result_get_dict_entry_string(res, "name", &name);
+ xmmsc_result_get_dict_entry_int(res, "id", &id);
p = g_malloc(sizeof(struct pl_params));
p->gml = gml;
@@ -122,10 +122,10 @@
gtk_tree_model_get(model, &iter, 0, &playlist, -1);
- res = xmmsc_playlist_clear(connection);
+ res = xmmsc_playlist_clear(connection, NULL);
xmmsc_result_unref(res);
- res = xmmsc_medialib_playlist_load(connection, playlist);
+ res = xmmsc_playlist_load(connection, playlist);
xmmsc_result_notifier_set(res, n_playlist_load, gml);
xmmsc_result_unref(res);
g_free(playlist);
@@ -156,12 +156,12 @@
gchar *playlist;
xmmsc_result_t *res;
- res = xmmsc_playlist_clear(connection);
+ res = xmmsc_playlist_clear(connection, NULL);
xmmsc_result_unref(res);
gtk_tree_model_get(model, &selected_row, 0, &playlist, -1);
- res = xmmsc_medialib_playlist_remove(connection, playlist);
+ res = xmmsc_playlist_remove(connection, playlist);
xmmsc_result_notifier_set(res, n_playlist_delete, gml);
xmmsc_result_unref(res);
g_free(playlist);
@@ -183,12 +183,12 @@
gchar *playlist;
xmmsc_result_t *res;
- res = xmmsc_playlist_clear(connection);
+ res = xmmsc_playlist_clear(connection, NULL);
xmmsc_result_unref(res);
gtk_tree_model_get(model, &selected_row, 0, &playlist, -1);
- res = xmmsc_medialib_playlist_load(connection, playlist);
+ res = xmmsc_playlist_load(connection, playlist);
xmmsc_result_notifier_set(res, n_playlist_load, gml);
xmmsc_result_unref(res);
g_free(playlist);
@@ -212,7 +212,7 @@
gtk_tree_model_get(model, &selected_row, 0, &playlist, -1);
- res = xmmsc_medialib_playlist_load(connection, playlist);
+ res = xmmsc_playlist_load(connection, playlist);
xmmsc_result_notifier_set(res, n_playlist_load, gml);
xmmsc_result_unref(res);
gtk_notebook_set_current_page(GTK_NOTEBOOK(gml->notebook), 3);
--- gmedialib/gmlsearch.c 2007-01-17 11:18:11.000000000 -0600
+++ gmedialib/gmlsearch.c 2007-01-31 15:19:50.000000000 -0600
@@ -56,7 +56,7 @@
if (gtk_tree_model_get_iter(model, &iter, path)) {
gtk_tree_model_get(model, &iter, 0, &id, -1);
- res = xmmsc_playlist_add_id(connection, id);
+ res = xmmsc_playlist_add_id(connection, NULL, id);
xmmsc_result_unref(res);
}
}
@@ -71,7 +71,7 @@
gtk_tree_model_get(model, selected_row, 0, &id, -1);
- res = xmmsc_playlist_add_id(connection, id);
+ res = xmmsc_playlist_add_id(connection, NULL, id);
xmmsc_result_unref(res);
}
@@ -97,7 +97,7 @@
gtk_tree_model_get(model, selected_row, 0, &id, -1);
- res = xmmsc_playlist_insert_id(connection, pos + 1, id);
+ res = xmmsc_playlist_insert_id(connection, NULL, pos + 1, id);
xmmsc_result_unref(res);
}
@@ -421,23 +421,23 @@
static gint tmp_id = -1;
GtkTreeIter iter;
- xmmsc_result_get_dict_entry_int32(res, "id", &id);
- xmmsc_result_get_dict_entry_int32(res, "tracknr", &tracknr);
- xmmsc_result_get_dict_entry_str( res, "title", &title);
- xmmsc_result_get_dict_entry_int32(res, "rating", &rating);
+ xmmsc_result_get_dict_entry_int(res, "id", &id);
+ xmmsc_result_get_dict_entry_int(res, "tracknr", &tracknr);
+ xmmsc_result_get_dict_entry_string( res, "title", &title);
+ xmmsc_result_get_dict_entry_int(res, "rating", &rating);
rating--;
if (title) {
- xmmsc_result_get_dict_entry_str(res, "artist", &artist);
+ xmmsc_result_get_dict_entry_string(res, "artist", &artist);
if (!artist)
artist = "[Unknown Artist]";
- xmmsc_result_get_dict_entry_str(res, "album", &album);
+ xmmsc_result_get_dict_entry_string(res, "album", &album);
if (!album)
album = "[Unknown Album]";
} else {
gchar *url, *url_utf8;
const gchar *url_tmp;
- xmmsc_result_get_dict_entry_str(res, "url", &url);
+ xmmsc_result_get_dict_entry_string(res, "url", &url);
if (url) {
url_tmp = xmmsc_result_decode_url(res, url);
url_utf8 = get_valid_utf8_str_alloc(url_tmp);
@@ -510,7 +510,7 @@
for (; xmmsc_result_list_valid(res); xmmsc_result_list_next(res)) {
gint32 *id = g_malloc(sizeof(gint32));
- xmmsc_result_get_dict_entry_int32(res, "id", id);
+ xmmsc_result_get_dict_entry_int(res, "id", id);
if (!id)
printf("broken resultset\n");
--- gtrackinfo/trackinfo.c 2007-01-17 11:18:11.000000000 -0600
+++ gtrackinfo/trackinfo.c 2007-01-31 14:59:27.000000000 -0600
@@ -33,43 +33,43 @@
track->no_samplerate = FALSE;
track->no_filesize = FALSE;
- if (!xmmsc_result_get_dict_entry_str(res, "artist", &artist)) {
+ if (!xmmsc_result_get_dict_entry_string(res, "artist", &artist)) {
artist = "Unknown";
track->no_artist = TRUE;
}
- if (!xmmsc_result_get_dict_entry_str(res, "title", &title)) {
+ if (!xmmsc_result_get_dict_entry_string(res, "title", &title)) {
title = "Unknown";
track->no_title = TRUE;
}
- if (!xmmsc_result_get_dict_entry_str(res, "album", &album)) {
+ if (!xmmsc_result_get_dict_entry_string(res, "album", &album)) {
album = "Unknown";
track->no_album = TRUE;
}
- if (!xmmsc_result_get_dict_entry_str(res, "comment", &comment))
+ if (!xmmsc_result_get_dict_entry_string(res, "comment", &comment))
comment = "";
- if (!xmmsc_result_get_dict_entry_int32(res, "duration", &playtime))
+ if (!xmmsc_result_get_dict_entry_int(res, "duration", &playtime))
track->no_playtime = TRUE;
- if (!xmmsc_result_get_dict_entry_int32(res, "id", &id))
+ if (!xmmsc_result_get_dict_entry_int(res, "id", &id))
id = 0;
- if (!xmmsc_result_get_dict_entry_str(res, "mime", &mime))
+ if (!xmmsc_result_get_dict_entry_string(res, "mime", &mime))
mime = "Unknown";
- if (!xmmsc_result_get_dict_entry_str(res, "genre", &genre))
+ if (!xmmsc_result_get_dict_entry_string(res, "genre", &genre))
genre = "";
- if (!xmmsc_result_get_dict_entry_int32(res, "bitrate", &bitrate))
+ if (!xmmsc_result_get_dict_entry_int(res, "bitrate", &bitrate))
track->no_bitrate = TRUE;
- if (!xmmsc_result_get_dict_entry_int32(res, "samplerate", &samplerate))
+ if (!xmmsc_result_get_dict_entry_int(res, "samplerate", &samplerate))
track->no_samplerate = TRUE;
- if (!xmmsc_result_get_dict_entry_int32(res, "size", &filesize))
+ if (!xmmsc_result_get_dict_entry_int(res, "size", &filesize))
track->no_filesize = TRUE;
- if (!xmmsc_result_get_dict_entry_str(res, "url", &url))
+ if (!xmmsc_result_get_dict_entry_string(res, "url", &url))
url = "";
- if (!xmmsc_result_get_dict_entry_str(res, "date", &date))
+ if (!xmmsc_result_get_dict_entry_string(res, "date", &date))
date = "";
- if (!xmmsc_result_get_dict_entry_str(res, "channel", &channel))
+ if (!xmmsc_result_get_dict_entry_string(res, "channel", &channel))
channel = "";
else
track->stream = TRUE;
- xmmsc_result_get_dict_entry_int32(res, "isvbr", &vbr);
+ xmmsc_result_get_dict_entry_int(res, "isvbr", &vbr);
if (vbr == 1) track->vbr = TRUE;
url_tmp = xmmsc_result_decode_url(res, url);
--- gxmms2src/gxmms2.c 2007-01-17 11:18:11.000000000 -0600
+++ gxmms2src/gxmms2.c 2007-01-31 15:22:05.000000000 -0600
@@ -113,7 +113,7 @@
guint32 volume;
gchar buf[64];
- xmmsc_result_get_dict_entry_uint32(res, "left", &volume);
+ xmmsc_result_get_dict_entry_uint(res, "left", &volume);
wejpvolume_set_volume(WEJPVOLUME(wv), volume);
snprintf(buf, 63, "Volume: %d %%", volume);
wejpscroller_shortmessage_show(WEJPSCROLLER(scroller), buf, 50);
@@ -123,7 +123,7 @@
{
guint32 volume;
- xmmsc_result_get_dict_entry_uint32(res, "left", &volume);
+ xmmsc_result_get_dict_entry_uint(res, "left", &volume);
wejpvolume_set_volume(WEJPVOLUME(wv), volume);
change_volume(0, volume);
xmmsc_result_unref(res);
@@ -662,7 +662,7 @@
m = 0;
/* decode %XX escape sequences to their corresponding chars: */
uri_conv = decode_string(buffer);
- res = xmmsc_playlist_add(connection, uri_conv);
+ res = xmmsc_playlist_add_url(connection, NULL, uri_conv);
xmmsc_result_unref(res);
g_free(uri_conv);
} else if (((guchar *)data->data)[n] > 31) {