Merge branch 'master' into devel

Conflicts:
	Makefile.am
	configure.ac
	deadbeef.h
	main.c
	plugins/oss/Makefile.am
	plugins/oss/oss.c

1 files changed, 1 insertions, 1 deletions

diff --git a/playlist.h b/playlist.h
index 59c67139..0fb5ad84 100644
--- a/playlist.h
+++ b/playlist.h
@@ -177,7 +177,7 @@ pl_get_item_duration (playItem_t *it);
 // returns number of characters printed, not including trailing 0
 // [a]rtist, [t]itle, al[b]um, [l]ength, track[n]umber
 int
-pl_format_title (playItem_t *it, char *s, int size, int id, const char *fmt);
+pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
 
 void
 pl_reset_cursor (void);