comparison src/audacious/dbus.c @ 3490:602ec8c40d0d trunk

Fixed to comply with the Tuple API changes.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 01 Sep 2007 07:09:38 +0300
parents 2a081105513c
children fd86a88426f4
comparison
equal deleted inserted replaced
3489:9580bb3e58fa 3490:602ec8c40d0d
176 } 176 }
177 177
178 GValue *tuple_value_to_gvalue(Tuple *tuple, const gchar *key) { 178 GValue *tuple_value_to_gvalue(Tuple *tuple, const gchar *key) {
179 GValue *val; 179 GValue *val;
180 TupleValueType type; 180 TupleValueType type;
181 type = tuple_get_value_type(tuple, key); 181 type = tuple_get_value_type(tuple, -1, key);
182 if (type == TUPLE_STRING) { 182 if (type == TUPLE_STRING) {
183 val = g_new0(GValue, 1); 183 val = g_new0(GValue, 1);
184 g_value_init(val, G_TYPE_STRING); 184 g_value_init(val, G_TYPE_STRING);
185 g_value_set_string(val, tuple_get_string(tuple, key)); 185 g_value_set_string(val, tuple_get_string(tuple, -1, key));
186 return val; 186 return val;
187 } else if (type == TUPLE_INT) { 187 } else if (type == TUPLE_INT) {
188 val = g_new0(GValue, 1); 188 val = g_new0(GValue, 1);
189 g_value_init(val, G_TYPE_INT); 189 g_value_init(val, G_TYPE_INT);
190 g_value_set_int(val, tuple_get_int(tuple, key)); 190 g_value_set_int(val, tuple_get_int(tuple, -1, key));
191 return val; 191 return val;
192 } 192 }
193 return NULL; 193 return NULL;
194 } 194 }
195 195
707 Tuple *tuple; 707 Tuple *tuple;
708 tuple = playlist_get_tuple(playlist_get_active(), pos); 708 tuple = playlist_get_tuple(playlist_get_active(), pos);
709 if (!tuple) { 709 if (!tuple) {
710 return FALSE; 710 return FALSE;
711 } else { 711 } else {
712 TupleValueType type = tuple_get_value_type(tuple, field); 712 TupleValueType type = tuple_get_value_type(tuple, -1, field);
713 713
714 switch(type) 714 switch(type)
715 { 715 {
716 case TUPLE_STRING: 716 case TUPLE_STRING:
717 g_value_init(value, G_TYPE_STRING); 717 g_value_init(value, G_TYPE_STRING);
718 g_value_set_string(value, tuple_get_string(tuple, field)); 718 g_value_set_string(value, tuple_get_string(tuple, -1, field));
719 break; 719 break;
720 case TUPLE_INT: 720 case TUPLE_INT:
721 g_value_init(value, G_TYPE_INT); 721 g_value_init(value, G_TYPE_INT);
722 g_value_set_int(value, tuple_get_int(tuple, field)); 722 g_value_set_int(value, tuple_get_int(tuple, -1, field));
723 break; 723 break;
724 default: 724 default:
725 return FALSE; 725 return FALSE;
726 break; 726 break;
727 } 727 }