oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.15.x'

Browse Source 
Conflicts:
	src/input/lastfm_input_plugin.c
	src/song_save.c
This commit is contained in:
Max Kellermann 2009-11-10 21:13:03 +01:00
commit de57c21a3b
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -72,10 +72,17 @@ ver 0.16 (20??/??/??)
ver 0.15.6 (2009/??/??) ver 0.15.6 (2009/??/??)
* input:
- lastfm: fixed variable name in GLib<2.16 code path
- input/mms: require libmms 0.4
* archive:
- zzip: require libzzip 0.13
* decoders: * decoders:
- ffmpeg: convert metadata - ffmpeg: convert metadata
* output_thread: check again if output is open on PAUSE * output_thread: check again if output is open on PAUSE
* update: delete ignored symlinks from database * update: delete ignored symlinks from database
* database: increased maximum line length to 32 kB
* sticker: added fallback for sqlite3_prepare_v2()
ver 0.15.5 (2009/10/18) ver 0.15.5 (2009/10/18)

4
configure.ac
View File

@ -322,7 +322,7 @@ AC_ARG_ENABLE(mms,
[enable the MMS protocol with libmms]),, [enable the MMS protocol with libmms]),,
[enable_mms=auto]) [enable_mms=auto])
MPD_AUTO_PKG(mms, MMS, [libmms], MPD_AUTO_PKG(mms, MMS, [libmms >= 0.4],
[libmms mms:// protocol support], [libmms not found]) [libmms mms:// protocol support], [libmms not found])
if test x$enable_mms = xyes; then if test x$enable_mms = xyes; then
AC_DEFINE(ENABLE_MMS, 1, AC_DEFINE(ENABLE_MMS, 1,
@ -358,7 +358,7 @@ AC_ARG_ENABLE(zip,
[enable zip archive support (default: disabled)]),, [enable zip archive support (default: disabled)]),,
enable_zip=no) enable_zip=no)
MPD_AUTO_PKG(zip, ZZIP, [zziplib], MPD_AUTO_PKG(zip, ZZIP, [zziplib >= 0.13],
[libzzip archive library], [libzzip not found]) [libzzip archive library], [libzzip not found])
AM_CONDITIONAL(HAVE_ZIP, test x$enable_zip = xyes) AM_CONDITIONAL(HAVE_ZIP, test x$enable_zip = xyes)

4
src/sticker.c
View File

@ -27,6 +27,10 @@
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "sticker" #define G_LOG_DOMAIN "sticker"
#if SQLITE_VERSION_NUMBER < 3003009
#define sqlite3_prepare_v2 sqlite3_prepare
#endif
struct sticker { struct sticker {
GHashTable *table; GHashTable *table;
}; };