Mercurial > audlegacy-plugins
changeset 2563:38f3540d6b06
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 12 May 2008 02:33:43 +0300 |
| parents | 89624b51e73d (diff) a3fecbacf65d (current diff) |
| children | b24eda79942b |
| files | |
| diffstat | 3 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/neon/rb.c Sun May 11 22:29:30 2008 +0100 +++ b/src/neon/rb.c Mon May 12 02:33:43 2008 +0300 @@ -125,11 +125,11 @@ } rb->size = size; - #ifdef _RB_USE_GLIB +#ifdef _RB_USE_GLIB if (NULL == (rb->lock = g_mutex_new())) { _LEAVE -1; } - #else +#else if (NULL == (rb->lock = malloc(sizeof(pthread_mutex_t)))) { _LEAVE -1; } @@ -138,7 +138,7 @@ free(rb->lock); _LEAVE -1; } - #endif +#endif rb->_free_lock = 1; reset_rb(rb);
--- a/src/pls/pls.c Sun May 11 22:29:30 2008 +0100 +++ b/src/pls/pls.c Mon May 12 02:33:43 2008 +0300 @@ -41,7 +41,7 @@ playlist_load_pls(const gchar * filename, gint pos) { guint i, count, added_count = 0; - gchar line_key[10], title_key[10]; + gchar line_key[16], title_key[16]; gchar *line, *title; Playlist *playlist = aud_playlist_get_active(); gchar *uri = NULL;
--- a/src/sid/xs_init.c Sun May 11 22:29:30 2008 +0100 +++ b/src/sid/xs_init.c Mon May 12 02:33:43 2008 +0300 @@ -28,22 +28,22 @@ InputPlugin xs_plugin_ip = { - .description = XS_PACKAGE_STRING, /* Plugin description */ - .init = xs_init, /* Initialization */ - .cleanup = xs_close, /* Cleanup */ - .about = xs_about, /* Show aboutbox */ - .configure = xs_configure, /* Show/edit configuration */ + .description = XS_PACKAGE_STRING, /* Plugin description */ + .init = xs_init, /* Initialization */ + .cleanup = xs_close, /* Cleanup */ + .about = xs_about, /* Show aboutbox */ + .configure = xs_configure, /* Show/edit configuration */ - .play_file = xs_play_file, /* Play given file */ - .stop = xs_stop, /* Stop playing */ - .pause = xs_pause, /* Pause playing */ - .seek = xs_seek, /* Seek time */ - .get_time = xs_get_time, /* Get playing time */ + .play_file = xs_play_file, /* Play given file */ + .stop = xs_stop, /* Stop playing */ + .pause = xs_pause, /* Pause playing */ + .seek = xs_seek, /* Seek time */ + .get_time = xs_get_time, /* Get playing time */ - .file_info_box = xs_fileinfo, /* Show file-information dialog */ + .file_info_box = xs_fileinfo, /* Show file-information dialog */ - .get_song_tuple = xs_get_song_tuple, /* Get Tuple */ - .vfs_extensions = xs_sid_fmts, /* File ext assist */ + .get_song_tuple = xs_get_song_tuple,/* Get Tuple */ + .vfs_extensions = xs_sid_fmts, /* File ext assist */ .probe_for_tuple = xs_probe_for_tuple, .have_subtune = TRUE };