aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-14 20:40:25 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-14 20:40:25 +0000
commitfd2f9b8e862c827b2b3e3c818d153bc2d9e8c99b (patch)
treede38d1ca3c034a92776d3ffdd7d339d3fc7b372d
parentfdf1afc8b3c4916e77fd12726fdcd4d90b40706d (diff)
downloadmpd-fd2f9b8e862c827b2b3e3c818d153bc2d9e8c99b.tar.gz
mpd-fd2f9b8e862c827b2b3e3c818d153bc2d9e8c99b.tar.xz
mpd-fd2f9b8e862c827b2b3e3c818d153bc2d9e8c99b.zip
Fix the undefined reference to `playerInitReal'
git-svn-id: https://svn.musicpd.org/mpd/trunk@4343 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/player.c2
-rw-r--r--src/player.h2
-rw-r--r--src/playerData.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/player.c b/src/player.c
index c7dff3456..7ac7d64aa 100644
--- a/src/player.c
+++ b/src/player.c
@@ -102,7 +102,7 @@ int playerInit() {
return 0;
}
-static int playerInitReal() {
+int playerInitReal() {
int player_pid;
blockSignals();
player_pid = fork();
diff --git a/src/player.h b/src/player.h
index c347dceaf..3ea6f5a73 100644
--- a/src/player.h
+++ b/src/player.h
@@ -89,6 +89,8 @@ typedef struct _PlayerControl {
MetadataChunk fileMetadataChunk;
} PlayerControl;
+int playerInitReal();
+
void player_sigChldHandler(int pid, int status);
int playerPlay(FILE * fp, Song * song);
diff --git a/src/playerData.c b/src/playerData.c
index 9e896ac9c..237c9036b 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -33,7 +33,7 @@ int buffered_chunks;
#define DEFAULT_BUFFER_SIZE 2048
#define DEFAULT_BUFFER_BEFORE_PLAY 0
-PlayerData * playerData_pd;
+static PlayerData * playerData_pd;
int * player_pid;
void initPlayerData() {
@@ -152,7 +152,7 @@ void initPlayerData() {
playerData_pd->playerControl.totalPlayTime = 0;
playerData_pd->playerControl.decode_pid = 0;
playerData_pd->playerControl.metadataState =
- PLAYER_METADATA_STATE_WRITE;
+ PLAYER_METADATA_STATE_WRITE;
playerData_pd->decoderControl.stop = 0;
playerData_pd->decoderControl.start = 0;