Mercurial > audlegacy
annotate src/audacious/tuple.c @ 4011:c19c8d47e221
vseparator in fileinfo came back
| author | Eugene Zagidullin <e.asphyx@gmail.com> |
|---|---|
| date | Sun, 25 Nov 2007 04:44:40 +0300 |
| parents | ba6258a39662 |
| children | 450581e58761 |
| rev | line source |
|---|---|
| 3278 | 1 /* |
| 2 * Audacious | |
| 3 * Copyright (c) 2006-2007 Audacious team | |
| 4 * | |
| 5 * This program is free software; you can redistribute it and/or modify | |
| 6 * it under the terms of the GNU General Public License as published by | |
| 7 * the Free Software Foundation; under version 3 of the License. | |
| 8 * | |
| 9 * This program is distributed in the hope that it will be useful, | |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 * GNU General Public License for more details. | |
| 13 * | |
| 14 * You should have received a copy of the GNU General Public License | |
| 15 * along with this program. If not, see <http://www.gnu.org/licenses>. | |
| 16 * | |
| 17 * The Audacious team does not consider modular code linking to | |
| 18 * Audacious or using our public API to be a derived work. | |
| 19 */ | |
| 20 | |
| 21 #include <glib.h> | |
| 22 #include <mowgli.h> | |
| 23 | |
| 24 #include "tuple.h" | |
|
3830
10053e99d90f
add strings.h include to remove a warning
William Pitcock <nenolod@atheme.org>
parents:
3828
diff
changeset
|
25 #include "strings.h" |
| 3278 | 26 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
27 const TupleBasicType tuple_fields[FIELD_LAST] = { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
28 { "artist", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
29 { "title", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
30 { "album", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
31 { "comment", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
32 { "genre", TUPLE_STRING }, |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
33 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
34 { "track", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
35 { "track-number", TUPLE_INT }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
36 { "length", TUPLE_INT }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
37 { "year", TUPLE_INT }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
38 { "quality", TUPLE_STRING }, |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
39 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
40 { "codec", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
41 { "file-name", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
42 { "file-path", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
43 { "file-ext", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
44 { "song-artist", TUPLE_STRING }, |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
45 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
46 { "mtime", TUPLE_INT }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
47 { "formatter", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
48 { "performer", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
49 { "copyright", TUPLE_STRING }, |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
50 { "date", TUPLE_STRING }, |
|
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3529
diff
changeset
|
51 |
|
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3529
diff
changeset
|
52 { "subsong-id", TUPLE_INT }, |
|
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3529
diff
changeset
|
53 { "subsong-num", TUPLE_INT }, |
|
4009
ba6258a39662
icon, codec and quality info added to file info box. Added new tuple field FIELD_MIMETYPE used for icon resolving
Eugene Zagidullin <e.asphyx@gmail.com>
parents:
3834
diff
changeset
|
54 { "mime-type", TUPLE_STRING }, |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
55 }; |
|
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
56 |
| 3504 | 57 static mowgli_heap_t *tuple_heap = NULL; |
| 58 static mowgli_heap_t *tuple_value_heap = NULL; | |
| 59 static mowgli_object_class_t tuple_klass; | |
| 60 | |
| 3278 | 61 |
|
3448
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
62 #define TUPLE_LOCKING |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
63 //#define TUPLE_DEBUG |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
64 |
|
3448
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
65 #ifdef TUPLE_LOCKING |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
66 static GStaticRWLock tuple_rwlock = G_STATIC_RW_LOCK_INIT; |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
67 # ifdef TUPLE_DEBUG |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
68 # define TUPDEB(X) fprintf(stderr, "TUPLE_" X "(%s:%d)\n", __FUNCTION__, __LINE__) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
69 # define TUPLE_LOCK_WRITE(XX) { TUPDEB("LOCK_WRITE"); g_static_rw_lock_writer_lock(&tuple_rwlock); } |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
70 # define TUPLE_UNLOCK_WRITE(XX) { TUPDEB("UNLOCK_WRITE"); g_static_rw_lock_writer_unlock(&tuple_rwlock); } |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
71 # define TUPLE_LOCK_READ(XX) { TUPDEB("LOCK_READ"); g_static_rw_lock_reader_lock(&tuple_rwlock); } |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
72 # define TUPLE_UNLOCK_READ(XX) { TUPDEB("UNLOCK_READ"); g_static_rw_lock_reader_unlock(&tuple_rwlock); } |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
73 # else |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
74 # define TUPLE_LOCK_WRITE(XX) g_static_rw_lock_writer_lock(&tuple_rwlock) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
75 # define TUPLE_UNLOCK_WRITE(XX) g_static_rw_lock_writer_unlock(&tuple_rwlock) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
76 # define TUPLE_LOCK_READ(XX) g_static_rw_lock_reader_lock(&tuple_rwlock) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
77 # define TUPLE_UNLOCK_READ(XX) g_static_rw_lock_reader_unlock(&tuple_rwlock) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
78 # endif |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
79 #else |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
80 # define TUPLE_LOCK_WRITE(XX) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
81 # define TUPLE_UNLOCK_WRITE(XX) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
82 # define TUPLE_LOCK_READ(XX) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
83 # define TUPLE_UNLOCK_READ(XX) |
|
004f822505b0
Added Tuple RW-lock debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
3427
diff
changeset
|
84 #endif |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
85 |
|
3280
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
86 /* iterative destructor of tuple values. */ |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
87 static void |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
88 tuple_value_destroy(mowgli_dictionary_elem_t *delem, gpointer privdata) |
|
3280
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
89 { |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
90 TupleValue *value = (TupleValue *) delem->data; |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
91 |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
92 if (value->type == TUPLE_STRING) |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
93 g_free(value->value.string); |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
94 |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
95 mowgli_heap_free(tuple_value_heap, value); |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
96 } |
|
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
97 |
| 3278 | 98 static void |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
99 tuple_destroy(gpointer data) |
| 3278 | 100 { |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
101 Tuple *tuple = (Tuple *) data; |
|
3528
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
102 gint i; |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
103 |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
104 TUPLE_LOCK_WRITE(); |
|
3280
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
105 mowgli_dictionary_destroy(tuple->dict, tuple_value_destroy, NULL); |
|
3528
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
106 |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
107 for (i = 0; i < FIELD_LAST; i++) |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
108 if (tuple->values[i]) { |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
109 TupleValue *value = tuple->values[i]; |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
110 |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
111 if (value->type == TUPLE_STRING) |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
112 g_free(value->value.string); |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
113 |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
114 mowgli_heap_free(tuple_value_heap, value); |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
115 } |
|
9cc39a38fdfe
Oops, static field values were not being freed, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3527
diff
changeset
|
116 |
|
3633
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3568
diff
changeset
|
117 g_free(tuple->subtunes); |
|
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3568
diff
changeset
|
118 |
| 3278 | 119 mowgli_heap_free(tuple_heap, tuple); |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
120 TUPLE_UNLOCK_WRITE(); |
| 3278 | 121 } |
| 122 | |
| 123 Tuple * | |
| 124 tuple_new(void) | |
| 125 { | |
| 126 Tuple *tuple; | |
| 127 | |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
128 TUPLE_LOCK_WRITE(); |
|
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
129 |
| 3278 | 130 if (tuple_heap == NULL) |
| 131 { | |
|
3529
7e8c4aadfc32
Make the default allocation values bigger.
Matti Hamalainen <ccr@tnsp.org>
parents:
3528
diff
changeset
|
132 tuple_heap = mowgli_heap_create(sizeof(Tuple), 512, BH_NOW); |
|
7e8c4aadfc32
Make the default allocation values bigger.
Matti Hamalainen <ccr@tnsp.org>
parents:
3528
diff
changeset
|
133 tuple_value_heap = mowgli_heap_create(sizeof(TupleValue), 1024, BH_NOW); |
| 3278 | 134 mowgli_object_class_init(&tuple_klass, "audacious.tuple", tuple_destroy, FALSE); |
| 135 } | |
| 136 | |
| 137 /* FIXME: use mowgli_object_bless_from_class() in mowgli 0.4 | |
| 138 when it is released --nenolod */ | |
| 139 tuple = mowgli_heap_alloc(tuple_heap); | |
|
3505
7d865b5f5a04
Oops, previous merge had removed an important memset(), fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
3504
diff
changeset
|
140 memset(tuple, 0, sizeof(Tuple)); |
| 3278 | 141 mowgli_object_init(mowgli_object(tuple), NULL, &tuple_klass, NULL); |
| 142 | |
| 143 tuple->dict = mowgli_dictionary_create(g_ascii_strcasecmp); | |
| 144 | |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
145 TUPLE_UNLOCK_WRITE(); |
| 3278 | 146 return tuple; |
| 147 } | |
| 148 | |
| 3834 | 149 static TupleValue * |
| 150 tuple_associate_data(Tuple *tuple, const gint cnfield, const gchar *field, TupleValueType ftype); | |
| 151 | |
| 3833 | 152 static gboolean |
| 153 _tuple_associate_raw_string(Tuple *tuple, const gint nfield, const gchar *field, const gchar *string) | |
| 154 { | |
| 155 TupleValue *value; | |
| 156 | |
| 157 TUPLE_LOCK_WRITE(); | |
| 158 if ((value = tuple_associate_data(tuple, nfield, field, TUPLE_STRING)) == NULL) | |
| 159 return FALSE; | |
| 160 | |
| 161 if (string == NULL) | |
| 162 value->value.string = NULL; | |
| 163 else | |
| 164 value->value.string = g_strdup(string); | |
| 165 | |
| 166 TUPLE_UNLOCK_WRITE(); | |
| 167 return TRUE; | |
| 168 } | |
| 169 | |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
170 Tuple * |
|
3304
00286cde2485
Make filename a const
Christian Birchinger <joker@netswarm.net>
parents:
3303
diff
changeset
|
171 tuple_new_from_filename(const gchar *filename) |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
172 { |
|
3303
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
173 gchar *scratch, *ext, *realfn; |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
174 Tuple *tuple; |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
175 |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
176 g_return_val_if_fail(filename != NULL, NULL); |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
177 |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
178 tuple = tuple_new(); |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
179 |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
180 g_return_val_if_fail(tuple != NULL, NULL); |
|
3303
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
181 |
|
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
182 realfn = g_filename_from_uri(filename, NULL, NULL); |
|
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
183 |
|
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
184 scratch = g_path_get_basename(realfn ? realfn : filename); |
| 3833 | 185 _tuple_associate_raw_string(tuple, FIELD_FILE_NAME, NULL, scratch); |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
186 g_free(scratch); |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
187 |
|
3303
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
188 scratch = g_path_get_dirname(realfn ? realfn : filename); |
| 3833 | 189 _tuple_associate_raw_string(tuple, FIELD_FILE_PATH, NULL, scratch); |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
190 g_free(scratch); |
|
3303
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
191 |
|
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
192 g_free(realfn); realfn = NULL; |
|
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
193 |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
194 ext = strrchr(filename, '.'); |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
195 if (ext != NULL) { |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
196 ++ext; |
| 3833 | 197 _tuple_associate_raw_string(tuple, FIELD_FILE_EXT, NULL, scratch); |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
198 } |
|
3303
eaf68ed98166
Use real filenames inside tuples not URIs
Christian Birchinger <joker@netswarm.net>
parents:
3301
diff
changeset
|
199 |
|
3301
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
200 return tuple; |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
201 } |
|
008530664ba1
Add tuple_new_from_filename() which creates a new tuple with file-name, file-path and file-ext.
Christian Birchinger <joker@netswarm.net>
parents:
3282
diff
changeset
|
202 |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
203 |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
204 static gint tuple_get_nfield(const gchar *field) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
205 { |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
206 gint i; |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
207 for (i = 0; i < FIELD_LAST; i++) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
208 if (!strcmp(field, tuple_fields[i].name)) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
209 return i; |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
210 return -1; |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
211 } |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
212 |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
213 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
214 static TupleValue * |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
215 tuple_associate_data(Tuple *tuple, const gint cnfield, const gchar *field, TupleValueType ftype) |
|
3491
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
216 { |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
217 const gchar *tfield = field; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
218 gint nfield = cnfield; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
219 TupleValue *value = NULL; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
220 |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
221 g_return_val_if_fail(tuple != NULL, NULL); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
222 g_return_val_if_fail(cnfield < FIELD_LAST, NULL); |
|
3491
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
223 |
|
3494
7d1dee4f660a
Check for known fields in tuple_associate_data() when given nfield is
Matti Hamalainen <ccr@tnsp.org>
parents:
3491
diff
changeset
|
224 /* Check for known fields */ |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
225 if (nfield < 0) { |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
226 nfield = tuple_get_nfield(field); |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
227 if (nfield >= 0) { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
228 fprintf(stderr, "WARNING! FIELD_* not used for '%s'!\n", field); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
229 } |
|
3494
7d1dee4f660a
Check for known fields in tuple_associate_data() when given nfield is
Matti Hamalainen <ccr@tnsp.org>
parents:
3491
diff
changeset
|
230 } |
|
7d1dee4f660a
Check for known fields in tuple_associate_data() when given nfield is
Matti Hamalainen <ccr@tnsp.org>
parents:
3491
diff
changeset
|
231 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
232 /* Check if field was known */ |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
233 if (nfield >= 0) { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
234 tfield = tuple_fields[nfield].name; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
235 value = tuple->values[nfield]; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
236 |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
237 if (ftype != tuple_fields[nfield].type) { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
238 /* FIXME! Convert values perhaps .. or not? */ |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
239 fprintf(stderr, "Invalid type for [%s](%d->%d), %d != %d\n", tfield, cnfield, nfield, ftype, tuple_fields[nfield].type); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
240 //mowgli_throw_exception_val(audacious.tuple.invalid_type_request, 0); |
| 3499 | 241 TUPLE_UNLOCK_WRITE(); |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
242 return NULL; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
243 } |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
244 } else { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
245 value = mowgli_dictionary_retrieve(tuple->dict, tfield); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
246 } |
| 3499 | 247 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
248 if (value != NULL) { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
249 /* Value exists, just delete old associated data */ |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
250 if (value->type == TUPLE_STRING) { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
251 g_free(value->value.string); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
252 value->value.string = NULL; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
253 } |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
254 } else { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
255 /* Allocate a new value */ |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
256 value = mowgli_heap_alloc(tuple_value_heap); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
257 value->type = ftype; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
258 if (nfield >= 0) |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
259 tuple->values[nfield] = value; |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
260 else |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
261 mowgli_dictionary_add(tuple->dict, tfield, value); |
|
3491
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
262 } |
| 3499 | 263 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
264 return value; |
|
3491
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
265 } |
|
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
266 |
| 3278 | 267 gboolean |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
268 tuple_associate_string(Tuple *tuple, const gint nfield, const gchar *field, const gchar *string) |
| 3278 | 269 { |
| 270 TupleValue *value; | |
| 271 | |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
272 TUPLE_LOCK_WRITE(); |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
273 if ((value = tuple_associate_data(tuple, nfield, field, TUPLE_STRING)) == NULL) |
|
3491
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
274 return FALSE; |
|
3329
70149c3555f4
For interest of transparency, make associating NULL equivilant to deleting the field.
William Pitcock <nenolod@atheme-project.org>
parents:
3304
diff
changeset
|
275 |
|
70149c3555f4
For interest of transparency, make associating NULL equivilant to deleting the field.
William Pitcock <nenolod@atheme-project.org>
parents:
3304
diff
changeset
|
276 if (string == NULL) |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
277 value->value.string = NULL; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
278 else |
| 3833 | 279 value->value.string = str_to_utf8(string); |
| 3278 | 280 |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
281 TUPLE_UNLOCK_WRITE(); |
| 3278 | 282 return TRUE; |
| 283 } | |
| 284 | |
| 285 gboolean | |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
286 tuple_associate_int(Tuple *tuple, const gint nfield, const gchar *field, gint integer) |
| 3278 | 287 { |
| 288 TupleValue *value; | |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
289 |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
290 TUPLE_LOCK_WRITE(); |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
291 if ((value = tuple_associate_data(tuple, nfield, field, TUPLE_INT)) == NULL) |
|
3491
899a7ed37a70
Clean up tiny bit of code duplication.
Matti Hamalainen <ccr@tnsp.org>
parents:
3489
diff
changeset
|
292 return FALSE; |
| 3278 | 293 |
| 294 value->value.integer = integer; | |
| 3499 | 295 |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
296 TUPLE_UNLOCK_WRITE(); |
| 3278 | 297 return TRUE; |
| 298 } | |
| 299 | |
| 300 void | |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
301 tuple_disassociate(Tuple *tuple, const gint cnfield, const gchar *field) |
| 3278 | 302 { |
| 303 TupleValue *value; | |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
304 gint nfield = cnfield; |
| 3278 | 305 |
| 306 g_return_if_fail(tuple != NULL); | |
| 3509 | 307 g_return_if_fail(nfield < FIELD_LAST); |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
308 |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
309 if (nfield < 0) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
310 nfield = tuple_get_nfield(field); |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
311 |
| 3499 | 312 TUPLE_LOCK_WRITE(); |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
313 if (nfield < 0) |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
314 /* why _delete()? because _delete() returns the dictnode's data on success */ |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
315 value = mowgli_dictionary_delete(tuple->dict, field); |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
316 else { |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
317 value = tuple->values[nfield]; |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
318 tuple->values[nfield] = NULL; |
|
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
319 } |
| 3278 | 320 |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
321 if (value == NULL) { |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
322 TUPLE_UNLOCK_WRITE(); |
| 3278 | 323 return; |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
324 } |
|
3409
86dafe2300f7
Added Tuplez compiler (not used yet, though) and some related changes in
Matti Hamalainen <ccr@tnsp.org>
parents:
3329
diff
changeset
|
325 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
326 /* Free associated data */ |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
327 if (value->type == TUPLE_STRING) { |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
328 g_free(value->value.string); |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
329 value->value.string = NULL; |
|
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
330 } |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
331 |
|
3498
9fcb90613e4f
Added types to base tuples.
Matti Hamalainen <ccr@tnsp.org>
parents:
3497
diff
changeset
|
332 mowgli_heap_free(tuple_value_heap, value); |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
333 TUPLE_UNLOCK_WRITE(); |
| 3278 | 334 } |
| 335 | |
| 336 TupleValueType | |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
337 tuple_get_value_type(Tuple *tuple, const gint cnfield, const gchar *field) |
| 3278 | 338 { |
| 3499 | 339 TupleValueType type = TUPLE_UNKNOWN; |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
340 gint nfield = cnfield; |
| 3278 | 341 |
|
3280
a26138e391ee
Tuple engine cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3278
diff
changeset
|
342 g_return_val_if_fail(tuple != NULL, TUPLE_UNKNOWN); |
| 3509 | 343 g_return_val_if_fail(nfield < FIELD_LAST, TUPLE_UNKNOWN); |
| 3499 | 344 |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
345 if (nfield < 0) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
346 nfield = tuple_get_nfield(field); |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
347 |
| 3499 | 348 TUPLE_LOCK_READ(); |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
349 if (nfield < 0) { |
| 3499 | 350 TupleValue *value; |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
351 if ((value = mowgli_dictionary_retrieve(tuple->dict, field)) != NULL) |
| 3499 | 352 type = value->type; |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
353 } else { |
|
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
354 if (tuple->values[nfield]) |
| 3504 | 355 type = tuple->values[nfield]->type; |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
356 } |
| 3499 | 357 |
| 358 TUPLE_UNLOCK_READ(); | |
| 359 return type; | |
| 3278 | 360 } |
| 361 | |
| 362 const gchar * | |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
363 tuple_get_string(Tuple *tuple, const gint cnfield, const gchar *field) |
| 3278 | 364 { |
| 365 TupleValue *value; | |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
366 gint nfield = cnfield; |
| 3278 | 367 |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
368 g_return_val_if_fail(tuple != NULL, NULL); |
| 3509 | 369 g_return_val_if_fail(nfield < FIELD_LAST, NULL); |
| 3278 | 370 |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
371 if (nfield < 0) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
372 nfield = tuple_get_nfield(field); |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
373 |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
374 TUPLE_LOCK_READ(); |
| 3499 | 375 if (nfield < 0) |
| 376 value = mowgli_dictionary_retrieve(tuple->dict, field); | |
| 377 else | |
| 378 value = tuple->values[nfield]; | |
| 3278 | 379 |
| 3499 | 380 if (value) { |
| 381 if (value->type != TUPLE_STRING) | |
| 382 mowgli_throw_exception_val(audacious.tuple.invalid_type_request, NULL); | |
| 383 | |
| 384 TUPLE_UNLOCK_READ(); | |
| 385 return value->value.string; | |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
386 } else { |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
387 TUPLE_UNLOCK_READ(); |
| 3278 | 388 return NULL; |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
389 } |
| 3278 | 390 } |
| 391 | |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
392 gint |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
393 tuple_get_int(Tuple *tuple, const gint cnfield, const gchar *field) |
| 3278 | 394 { |
| 395 TupleValue *value; | |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
396 gint nfield = cnfield; |
| 3278 | 397 |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
398 g_return_val_if_fail(tuple != NULL, 0); |
| 3509 | 399 g_return_val_if_fail(nfield < FIELD_LAST, 0); |
| 3278 | 400 |
|
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
401 if (nfield < 0) |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
402 nfield = tuple_get_nfield(field); |
|
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3509
diff
changeset
|
403 |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
404 TUPLE_LOCK_READ(); |
| 3499 | 405 if (nfield < 0) |
| 406 value = mowgli_dictionary_retrieve(tuple->dict, field); | |
| 407 else | |
| 408 value = tuple->values[nfield]; | |
| 409 | |
| 410 if (value) { | |
| 411 if (value->type != TUPLE_INT) | |
| 412 mowgli_throw_exception_val(audacious.tuple.invalid_type_request, 0); | |
| 413 | |
| 414 TUPLE_UNLOCK_READ(); | |
| 415 return value->value.integer; | |
|
3489
9580bb3e58fa
Tuple handling API changed to include support for "hardcoded" fields.
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
416 } else { |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
417 TUPLE_UNLOCK_READ(); |
|
3282
b78d3197c70d
Tuple (final version)
William Pitcock <nenolod@atheme-project.org>
parents:
3281
diff
changeset
|
418 return 0; |
|
3427
7c2e63c5a001
Add a global GStaticRWLock to Tuple handling code. This should prevent
Matti Hamalainen <ccr@tnsp.org>
parents:
3409
diff
changeset
|
419 } |
| 3278 | 420 } |
