aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-31 03:18:30 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-31 03:18:30 +0000
commitded15bf118d170c0172609b0dce11ce42df80241 (patch)
treea087fc62288a5119c26ce0f398df86ed6817be8b /src
parent4de1a41c835994540e7c160353a00c901d92b6a1 (diff)
downloadmpd-ded15bf118d170c0172609b0dce11ce42df80241.tar.gz
mpd-ded15bf118d170c0172609b0dce11ce42df80241.tar.xz
mpd-ded15bf118d170c0172609b0dce11ce42df80241.zip
fix avuton's mp4 compile bug
git-svn-id: https://svn.musicpd.org/mpd/trunk@1253 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/inputPlugins/mp4_plugin.c2
-rw-r--r--src/playlist.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index b34b3c421..350aae777 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -322,7 +322,7 @@ MpdTag * mp4DataDup(char * file, int * mp4MetadataFound) {
*mp4MetadataFound = 0;
- if(openInputStream(file) < 0) return NULL;
+ if(openInputStream(&inStream, file) < 0) return NULL;
cb = malloc(sizeof(mp4ff_callback_t));
cb->read = mp4_inputStreamReadCallback;
diff --git a/src/playlist.c b/src/playlist.c
index 412ddce19..0c499f0ad 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -687,6 +687,9 @@ int playPlaylist(FILE * fp, int song, int stopOnError) {
clearPlayerError();
if(song==-1) {
+ if(playlist_state == PLAYLIST_STATE_PLAY) {
+ return playerSetPause(fp, 0);
+ }
if(playlist.current >= 0 && playlist.current < playlist.length)
{
i = playlist.current;