Mercurial > audlegacy
changeset 2090:b89947411061 trunk
[svn] Make controlsocket.c happier. Still a ton of warnings, but it compiles now.
| author | kiyoshi |
|---|---|
| date | Mon, 11 Dec 2006 04:46:09 -0800 |
| parents | ef095eb43578 |
| children | 3b6bd01ba05c |
| files | ChangeLog audacious/controlsocket.c doc/libaudacious/libaudacious-decl-list.txt doc/libaudacious/libaudacious-decl.txt doc/libaudacious/libaudacious-unused.txt |
| diffstat | 5 files changed, 403 insertions(+), 352 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 11 04:36:50 2006 -0800 +++ b/ChangeLog Mon Dec 11 04:46:09 2006 -0800 @@ -1,3 +1,10 @@ +2006-12-11 12:36:50 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [3183] + Add playlist_get_active where required. + trunk/audacious/output.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + + 2006-12-11 12:34:17 +0000 William Pitcock <nenolod@nenolod.net> revision [3181] - update main.c to new API
--- a/audacious/controlsocket.c Mon Dec 11 04:36:50 2006 -0800 +++ b/audacious/controlsocket.c Mon Dec 11 04:46:09 2006 -0800 @@ -373,28 +373,27 @@ ctrl_ack_packet(pkt); break; case CMD_GET_PLAYLIST_POS: - ctrl_write_gint(pkt->fd, playlist_get_position()); + ctrl_write_gint(pkt->fd, playlist_get_position(playlist_get_active())); ctrl_ack_packet(pkt); break; case CMD_GET_PLAYLIST_LENGTH: - ctrl_write_gint(pkt->fd, playlist_get_length()); + ctrl_write_gint(pkt->fd, playlist_get_length(playlist_get_active())); ctrl_ack_packet(pkt); break; case CMD_GET_PLAYQUEUE_LENGTH: - ctrl_write_gint(pkt->fd, playlist_queue_get_length()); + ctrl_write_gint(pkt->fd, playlist_queue_get_length(playlist_get_active())); ctrl_ack_packet(pkt); break; case CMD_PLAYQUEUE_IS_QUEUED: ctrl_write_gboolean(pkt->fd, - playlist_is_position_queued(*((guint32 *) pkt->data))); + playlist_is_position_queued(* ((guint32 *) pkt->data), playlist_get_active())); ctrl_ack_packet(pkt); break; case CMD_PLAYQUEUE_GET_POS: if (pkt->data) ctrl_write_gint(pkt->fd, - playlist_get_queue_position_number(* - ((guint32 *) pkt-> - data))); + playlist_get_queue_position_number(* ((guint32 *) pkt->data), + playlist_get_active())); else ctrl_write_gint(pkt->fd, 0); @@ -403,9 +402,8 @@ case CMD_PLAYQUEUE_GET_QPOS: if (pkt->data) ctrl_write_gint(pkt->fd, - playlist_get_queue_qposition_number(* - ((guint32 *) pkt-> - data))); + playlist_get_queue_qposition_number(* ((guint32 *) pkt->data), + playlist_get_active())); else ctrl_write_gint(pkt->fd, 0); @@ -443,7 +441,7 @@ case CMD_GET_PLAYLIST_FILE: if (pkt->data) { gchar *filename; - filename = playlist_get_filename(*((guint32 *) pkt->data)); + filename = playlist_get_filename(*((guint32 *) pkt->data), playlist_get_active()); ctrl_write_string(pkt->fd, filename); g_free(filename); } @@ -454,7 +452,7 @@ case CMD_GET_PLAYLIST_TITLE: if (pkt->data) { gchar *title; - title = playlist_get_songtitle(*((guint32 *) pkt->data)); + title = playlist_get_songtitle(*((guint32 *) pkt->data), playlist_get_active()); ctrl_write_string(pkt->fd, title); g_free(title); } @@ -465,9 +463,8 @@ case CMD_GET_PLAYLIST_TIME: if (pkt->data) ctrl_write_gint(pkt->fd, - playlist_get_songtime(* - ((guint32 *) pkt-> - data))); + playlist_get_songtime(*((guint32 *) pkt->data), + playlist_get_active())); else ctrl_write_gint(pkt->fd, -1); @@ -497,7 +494,7 @@ memcpy(filename, dataptr, len); GDK_THREADS_ENTER(); - playlist_add_url(filename); + playlist_add_url(filename, playlist_get_active()); GDK_THREADS_LEAVE(); g_free(filename); @@ -508,7 +505,7 @@ break; case CMD_PLAYLIST_ADD_URL_STRING: GDK_THREADS_ENTER(); - playlist_add_url(pkt->data); + playlist_add_url(pkt->data, playlist_get_active()); GDK_THREADS_LEAVE(); ctrl_ack_packet(pkt); @@ -518,19 +515,19 @@ gint pos = *(gint *) pkt->data; gchar *ptr = pkt->data; ptr += sizeof(gint); - playlist_ins_url(ptr, pos); + playlist_ins_url(ptr, pos, playlist_get_active()); } ctrl_ack_packet(pkt); break; case CMD_PLAYLIST_DELETE: GDK_THREADS_ENTER(); - playlist_delete_index(*((guint32 *) pkt->data)); + playlist_delete_index(*((guint32 *) pkt->data), playlist_get_active()); GDK_THREADS_LEAVE(); ctrl_ack_packet(pkt); break; case CMD_PLAYLIST_CLEAR: GDK_THREADS_ENTER(); - playlist_clear(); + playlist_clear(playlist_get_active()); mainwin_clear_song_info(); mainwin_set_info_text(); GDK_THREADS_LEAVE(); @@ -611,7 +608,7 @@ case CMD_PLAY: if (bmp_playback_get_paused()) bmp_playback_pause(); - else if (playlist_get_length()) + else if (playlist_get_length(playlist_get_active())) bmp_playback_initiate(); else mainwin_eject_pushed(); @@ -633,26 +630,26 @@ break; case CMD_PLAYQUEUE_ADD: num = *((guint32 *) data); - if (num < (guint)playlist_get_length()) - playlist_queue_position(num); + if (num < (guint)playlist_get_length(playlist_get_active())) + playlist_queue_position(num, playlist_get_active()); break; case CMD_PLAYQUEUE_REMOVE: num = *((guint32 *) data); - if (num < (guint)playlist_get_length()) - playlist_queue_remove(num); + if (num < (guint)playlist_get_length(playlist_get_active())) + playlist_queue_remove(num, playlist_get_active()); break; case CMD_PLAYQUEUE_CLEAR: - playlist_clear_queue(); + playlist_clear_queue(playlist_get_active()); break; case CMD_SET_PLAYLIST_POS: num = *((guint32 *) data); - if (num < (guint)playlist_get_length()) - playlist_set_position(num); + if (num < (guint)playlist_get_length(playlist_get_active())) + playlist_set_position(num, playlist_get_active()); break; case CMD_JUMP_TO_TIME: num = *((guint32 *) data); - if (playlist_get_current_length() > 0 && - num < (guint)playlist_get_current_length()) + if (playlist_get_current_length(playlist_get_active()) > 0 && + num < (guint)playlist_get_current_length(playlist_get_active())) bmp_playback_seek(num / 1000); break; case CMD_SET_VOLUME: @@ -707,10 +704,10 @@ mainwin_eject_pushed(); break; case CMD_PLAYLIST_PREV: - playlist_prev(); + playlist_prev(playlist_get_active()); break; case CMD_PLAYLIST_NEXT: - playlist_next(); + playlist_next(playlist_get_active()); break; case CMD_TOGGLE_REPEAT: mainwin_repeat_pushed(!cfg.repeat);
--- a/doc/libaudacious/libaudacious-decl-list.txt Mon Dec 11 04:36:50 2006 -0800 +++ b/doc/libaudacious/libaudacious-decl-list.txt Mon Dec 11 04:46:09 2006 -0800 @@ -1,8 +1,3 @@ -<SECTION> -<FILE>dirbrowser</FILE> -xmms_create_dir_browser -</SECTION> - <SECTION> <FILE>vfs</FILE> VFSFile @@ -26,6 +21,83 @@ </SECTION> <SECTION> +<FILE>configdb</FILE> +ConfigDb +bmp_cfg_db_open +bmp_cfg_db_close +bmp_cfg_db_get_string +bmp_cfg_db_get_int +bmp_cfg_db_get_bool +bmp_cfg_db_get_float +bmp_cfg_db_get_double +bmp_cfg_db_set_string +bmp_cfg_db_set_int +bmp_cfg_db_set_bool +bmp_cfg_db_set_float +bmp_cfg_db_set_double +bmp_cfg_db_unset_key +</SECTION> + +<SECTION> +<FILE>rcfile</FILE> +RcLine +RcSection +RcFile +bmp_rcfile_new +bmp_rcfile_free +bmp_rcfile_open +bmp_rcfile_write +bmp_rcfile_read_string +bmp_rcfile_read_int +bmp_rcfile_read_bool +bmp_rcfile_read_float +bmp_rcfile_read_double +bmp_rcfile_write_string +bmp_rcfile_write_int +bmp_rcfile_write_boolean +bmp_rcfile_write_float +bmp_rcfile_write_double +bmp_rcfile_remove_key +</SECTION> + +<SECTION> +<FILE>formatter</FILE> +Formatter +xmms_formatter_new +xmms_formatter_destroy +xmms_formatter_associate +xmms_formatter_dissociate +xmms_formatter_format +</SECTION> + +<SECTION> +<FILE>titlestring</FILE> +TitleInput +BmpTitleInput +XMMS_TITLEINPUT_SIZE +XMMS_TITLEINPUT_VERSION +XMMS_NEW_TITLEINPUT +bmp_title_input_new +bmp_title_input_free +xmms_get_titlestring +xmms_titlestring_descriptions +</SECTION> + +<SECTION> +<FILE>xconvert</FILE> +xmms_convert_buffers +</SECTION> + +<SECTION> +<FILE>dirbrowser</FILE> +xmms_create_dir_browser +</SECTION> + +<SECTION> +<FILE>util</FILE> +</SECTION> + +<SECTION> <FILE>beepctrl</FILE> xmms_connect_to_session xmms_remote_playlist @@ -100,74 +172,15 @@ </SECTION> <SECTION> -<FILE>formatter</FILE> -Formatter -xmms_formatter_new -xmms_formatter_destroy -xmms_formatter_associate -xmms_formatter_dissociate -xmms_formatter_format -</SECTION> - -<SECTION> -<FILE>rcfile</FILE> -RcLine -RcSection -RcFile -bmp_rcfile_new -bmp_rcfile_free -bmp_rcfile_open -bmp_rcfile_write -bmp_rcfile_read_string -bmp_rcfile_read_int -bmp_rcfile_read_bool -bmp_rcfile_read_float -bmp_rcfile_read_double -bmp_rcfile_write_string -bmp_rcfile_write_int -bmp_rcfile_write_boolean -bmp_rcfile_write_float -bmp_rcfile_write_double -bmp_rcfile_remove_key +<FILE>urldecode</FILE> +xmms_urldecode_path +xmms_urldecode_plain </SECTION> <SECTION> -<FILE>titlestring</FILE> -TitleInput -BmpTitleInput -XMMS_TITLEINPUT_SIZE -XMMS_TITLEINPUT_VERSION -XMMS_NEW_TITLEINPUT -bmp_title_input_new -bmp_title_input_free -xmms_get_titlestring -xmms_titlestring_descriptions -</SECTION> - -<SECTION> -<FILE>xconvert</FILE> -xmms_convert_buffers +<FILE>vfs_buffer</FILE> +VFSBuffer +vfs_buffer_new +vfs_buffer_new_from_string </SECTION> -<SECTION> -<FILE>configdb</FILE> -ConfigDb -bmp_cfg_db_open -bmp_cfg_db_close -bmp_cfg_db_get_string -bmp_cfg_db_get_int -bmp_cfg_db_get_bool -bmp_cfg_db_get_float -bmp_cfg_db_get_double -bmp_cfg_db_set_string -bmp_cfg_db_set_int -bmp_cfg_db_set_bool -bmp_cfg_db_set_float -bmp_cfg_db_set_double -bmp_cfg_db_unset_key -</SECTION> - -<SECTION> -<FILE>util</FILE> -</SECTION> -
--- a/doc/libaudacious/libaudacious-decl.txt Mon Dec 11 04:36:50 2006 -0800 +++ b/doc/libaudacious/libaudacious-decl.txt Mon Dec 11 04:46:09 2006 -0800 @@ -1,8 +1,3 @@ -<FUNCTION> -<NAME>xmms_create_dir_browser</NAME> -<RETURNS>GtkWidget *</RETURNS> -gchar * title, gchar * current_path,GtkSelectionMode mode,void (*handler) (gchar *) -</FUNCTION> <STRUCT> <NAME>VFSFile</NAME> </STRUCT> @@ -117,6 +112,267 @@ <RETURNS>gboolean </RETURNS> VFSConstructor *vtable </FUNCTION> +<STRUCT> +<NAME>ConfigDb</NAME> +</STRUCT> +<FUNCTION> +<NAME>bmp_cfg_db_open</NAME> +<RETURNS>ConfigDb *</RETURNS> + +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_close</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_get_string</NAME> +<RETURNS>gboolean </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gchar **value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_get_int</NAME> +<RETURNS>gboolean </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gint *value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_get_bool</NAME> +<RETURNS>gboolean </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gboolean *value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_get_float</NAME> +<RETURNS>gboolean </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gfloat *value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_get_double</NAME> +<RETURNS>gboolean </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gdouble *value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_set_string</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gchar *value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_set_int</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gint value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_set_bool</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gboolean value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_set_float</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gfloat value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_set_double</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key,gdouble value +</FUNCTION> +<FUNCTION> +<NAME>bmp_cfg_db_unset_key</NAME> +<RETURNS>void </RETURNS> +ConfigDb *db,const gchar *section,const gchar *key +</FUNCTION> +<STRUCT> +<NAME>RcLine</NAME> +typedef struct { + gchar *key; + gchar *value; +} RcLine; +</STRUCT> +<STRUCT> +<NAME>RcSection</NAME> +typedef struct { + gchar *name; + GList *lines; +} RcSection; +</STRUCT> +<STRUCT> +<NAME>RcFile</NAME> +typedef struct { + GList *sections; +} RcFile; +</STRUCT> +<FUNCTION> +<NAME>bmp_rcfile_new</NAME> +<RETURNS>RcFile *</RETURNS> +void +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_free</NAME> +<RETURNS>void </RETURNS> +RcFile * file +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_open</NAME> +<RETURNS>RcFile *</RETURNS> +const gchar * filename +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_write</NAME> +<RETURNS>gboolean </RETURNS> +RcFile * file, const gchar * filename +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_read_string</NAME> +<RETURNS>gboolean </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gchar ** value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_read_int</NAME> +<RETURNS>gboolean </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gint * value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_read_bool</NAME> +<RETURNS>gboolean </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gboolean * value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_read_float</NAME> +<RETURNS>gboolean </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gfloat * value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_read_double</NAME> +<RETURNS>gboolean </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gdouble * value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_write_string</NAME> +<RETURNS>void </RETURNS> +RcFile * file, const gchar * section,const gchar * key, const gchar * value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_write_int</NAME> +<RETURNS>void </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gint value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_write_boolean</NAME> +<RETURNS>void </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gboolean value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_write_float</NAME> +<RETURNS>void </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gfloat value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_write_double</NAME> +<RETURNS>void </RETURNS> +RcFile * file, const gchar * section,const gchar * key, gdouble value +</FUNCTION> +<FUNCTION> +<NAME>bmp_rcfile_remove_key</NAME> +<RETURNS>void </RETURNS> +RcFile * file, const gchar * section,const gchar * key +</FUNCTION> +<STRUCT> +<NAME>Formatter</NAME> +typedef struct { + gchar *values[256]; +} Formatter; +</STRUCT> +<FUNCTION> +<NAME>xmms_formatter_new</NAME> +<RETURNS>Formatter *</RETURNS> +void +</FUNCTION> +<FUNCTION> +<NAME>xmms_formatter_destroy</NAME> +<RETURNS>void </RETURNS> +Formatter * formatter +</FUNCTION> +<FUNCTION> +<NAME>xmms_formatter_associate</NAME> +<RETURNS>void </RETURNS> +Formatter * formatter, guchar id,gchar * value +</FUNCTION> +<FUNCTION> +<NAME>xmms_formatter_dissociate</NAME> +<RETURNS>void </RETURNS> +Formatter * formatter, guchar id +</FUNCTION> +<FUNCTION> +<NAME>xmms_formatter_format</NAME> +<RETURNS>gchar *</RETURNS> +Formatter * formatter, gchar * format +</FUNCTION> +<STRUCT> +<NAME>TitleInput</NAME> +typedef struct { + gint __size; /* Set by bmp_title_input_new() */ + gint __version; /* Ditto */ + + gchar *performer; /* %p */ + gchar *album_name; /* %a */ + gchar *track_name; /* %t */ + gint track_number; /* %n */ + gint year; /* %y */ + gchar *date; /* %d */ + gchar *genre; /* %g */ + gchar *comment; /* %c */ + gchar *file_name; /* %f */ + const gchar *file_ext; /* %e *//* is not always strdup'ed, see xmms_input_get_song_info and plugins! */ + gchar *file_path; /* %F */ + gint length; /* not displayable */ + gchar *formatter; /* not displayable */ + time_t mtime; +} TitleInput; +</STRUCT> +<TYPEDEF> +<NAME>BmpTitleInput</NAME> +typedef TitleInput BmpTitleInput; +</TYPEDEF> +<MACRO> +<NAME>XMMS_TITLEINPUT_SIZE</NAME> +#define XMMS_TITLEINPUT_SIZE sizeof(TitleInput) +</MACRO> +<MACRO> +<NAME>XMMS_TITLEINPUT_VERSION</NAME> +#define XMMS_TITLEINPUT_VERSION (1) +</MACRO> +<MACRO> +<NAME>XMMS_NEW_TITLEINPUT</NAME> +#define XMMS_NEW_TITLEINPUT(input) input = bmp_title_input_new(); +</MACRO> +<FUNCTION> +<NAME>bmp_title_input_new</NAME> +<RETURNS>TitleInput *</RETURNS> +void +</FUNCTION> +<FUNCTION> +<NAME>bmp_title_input_free</NAME> +<RETURNS>void </RETURNS> +BmpTitleInput * input +</FUNCTION> +<FUNCTION> +<NAME>xmms_get_titlestring</NAME> +<RETURNS>gchar *</RETURNS> +const gchar * fmt, TitleInput * input +</FUNCTION> +<FUNCTION> +<NAME>xmms_titlestring_descriptions</NAME> +<RETURNS>GtkWidget *</RETURNS> +gchar * tags, gint columns +</FUNCTION> +<STRUCT> +<NAME>xmms_convert_buffers</NAME> +struct xmms_convert_buffers; +</STRUCT> +<FUNCTION> +<NAME>xmms_create_dir_browser</NAME> +<RETURNS>GtkWidget *</RETURNS> +gchar * title, gchar * current_path,GtkSelectionMode mode,void (*handler) (gchar *) +</FUNCTION> <FUNCTION> <NAME>xmms_connect_to_session</NAME> <RETURNS>gint </RETURNS> @@ -467,259 +723,32 @@ #define xmms_remote_add_files(session,list) \ xmms_remote_playlist_add(session,list) </MACRO> -<STRUCT> -<NAME>Formatter</NAME> -typedef struct { - gchar *values[256]; -} Formatter; -</STRUCT> <FUNCTION> -<NAME>xmms_formatter_new</NAME> -<RETURNS>Formatter *</RETURNS> -void -</FUNCTION> -<FUNCTION> -<NAME>xmms_formatter_destroy</NAME> -<RETURNS>void </RETURNS> -Formatter * formatter -</FUNCTION> -<FUNCTION> -<NAME>xmms_formatter_associate</NAME> -<RETURNS>void </RETURNS> -Formatter * formatter, guchar id,gchar * value -</FUNCTION> -<FUNCTION> -<NAME>xmms_formatter_dissociate</NAME> -<RETURNS>void </RETURNS> -Formatter * formatter, guchar id -</FUNCTION> -<FUNCTION> -<NAME>xmms_formatter_format</NAME> +<NAME>xmms_urldecode_path</NAME> <RETURNS>gchar *</RETURNS> -Formatter * formatter, gchar * format -</FUNCTION> -<STRUCT> -<NAME>RcLine</NAME> -typedef struct { - gchar *key; - gchar *value; -} RcLine; -</STRUCT> -<STRUCT> -<NAME>RcSection</NAME> -typedef struct { - gchar *name; - GList *lines; -} RcSection; -</STRUCT> -<STRUCT> -<NAME>RcFile</NAME> -typedef struct { - GList *sections; -} RcFile; -</STRUCT> -<FUNCTION> -<NAME>bmp_rcfile_new</NAME> -<RETURNS>RcFile *</RETURNS> -void -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_free</NAME> -<RETURNS>void </RETURNS> -RcFile * file +const gchar * </FUNCTION> <FUNCTION> -<NAME>bmp_rcfile_open</NAME> -<RETURNS>RcFile *</RETURNS> -const gchar * filename -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_write</NAME> -<RETURNS>gboolean </RETURNS> -RcFile * file, const gchar * filename -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_read_string</NAME> -<RETURNS>gboolean </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gchar ** value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_read_int</NAME> -<RETURNS>gboolean </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gint * value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_read_bool</NAME> -<RETURNS>gboolean </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gboolean * value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_read_float</NAME> -<RETURNS>gboolean </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gfloat * value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_read_double</NAME> -<RETURNS>gboolean </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gdouble * value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_write_string</NAME> -<RETURNS>void </RETURNS> -RcFile * file, const gchar * section,const gchar * key, const gchar * value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_write_int</NAME> -<RETURNS>void </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gint value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_write_boolean</NAME> -<RETURNS>void </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gboolean value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_write_float</NAME> -<RETURNS>void </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gfloat value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_write_double</NAME> -<RETURNS>void </RETURNS> -RcFile * file, const gchar * section,const gchar * key, gdouble value -</FUNCTION> -<FUNCTION> -<NAME>bmp_rcfile_remove_key</NAME> -<RETURNS>void </RETURNS> -RcFile * file, const gchar * section,const gchar * key +<NAME>xmms_urldecode_plain</NAME> +<RETURNS>gchar *</RETURNS> +const gchar * </FUNCTION> <STRUCT> -<NAME>TitleInput</NAME> +<NAME>VFSBuffer</NAME> typedef struct { - gint __size; /* Set by bmp_title_input_new() */ - gint __version; /* Ditto */ - - gchar *performer; /* %p */ - gchar *album_name; /* %a */ - gchar *track_name; /* %t */ - gint track_number; /* %n */ - gint year; /* %y */ - gchar *date; /* %d */ - gchar *genre; /* %g */ - gchar *comment; /* %c */ - gchar *file_name; /* %f */ - const gchar *file_ext; /* %e *//* is not always strdup'ed, see xmms_input_get_song_info and plugins! */ - gchar *file_path; /* %F */ - gint length; /* not displayable */ - gchar *formatter; /* not displayable */ - time_t mtime; -} TitleInput; -</STRUCT> -<TYPEDEF> -<NAME>BmpTitleInput</NAME> -typedef TitleInput BmpTitleInput; -</TYPEDEF> -<MACRO> -<NAME>XMMS_TITLEINPUT_SIZE</NAME> -#define XMMS_TITLEINPUT_SIZE sizeof(TitleInput) -</MACRO> -<MACRO> -<NAME>XMMS_TITLEINPUT_VERSION</NAME> -#define XMMS_TITLEINPUT_VERSION (1) -</MACRO> -<MACRO> -<NAME>XMMS_NEW_TITLEINPUT</NAME> -#define XMMS_NEW_TITLEINPUT(input) input = bmp_title_input_new(); -</MACRO> -<FUNCTION> -<NAME>bmp_title_input_new</NAME> -<RETURNS>TitleInput *</RETURNS> -void -</FUNCTION> -<FUNCTION> -<NAME>bmp_title_input_free</NAME> -<RETURNS>void </RETURNS> -BmpTitleInput * input -</FUNCTION> -<FUNCTION> -<NAME>xmms_get_titlestring</NAME> -<RETURNS>gchar *</RETURNS> -const gchar * fmt, TitleInput * input -</FUNCTION> -<FUNCTION> -<NAME>xmms_titlestring_descriptions</NAME> -<RETURNS>GtkWidget *</RETURNS> -gchar * tags, gint columns -</FUNCTION> -<STRUCT> -<NAME>xmms_convert_buffers</NAME> -struct xmms_convert_buffers; -</STRUCT> -<STRUCT> -<NAME>ConfigDb</NAME> + guchar *data; + guchar *iter; + guchar *end; + gsize size; +} VFSBuffer; </STRUCT> <FUNCTION> -<NAME>bmp_cfg_db_open</NAME> -<RETURNS>ConfigDb *</RETURNS> - -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_close</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_get_string</NAME> -<RETURNS>gboolean </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gchar **value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_get_int</NAME> -<RETURNS>gboolean </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gint *value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_get_bool</NAME> -<RETURNS>gboolean </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gboolean *value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_get_float</NAME> -<RETURNS>gboolean </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gfloat *value +<NAME>vfs_buffer_new</NAME> +<RETURNS>VFSFile *</RETURNS> +gpointer data, gsize size </FUNCTION> <FUNCTION> -<NAME>bmp_cfg_db_get_double</NAME> -<RETURNS>gboolean </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gdouble *value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_set_string</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gchar *value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_set_int</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gint value +<NAME>vfs_buffer_new_from_string</NAME> +<RETURNS>VFSFile *</RETURNS> +gchar *str </FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_set_bool</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gboolean value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_set_float</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gfloat value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_set_double</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key,gdouble value -</FUNCTION> -<FUNCTION> -<NAME>bmp_cfg_db_unset_key</NAME> -<RETURNS>void </RETURNS> -ConfigDb *db,const gchar *section,const gchar *key -</FUNCTION>