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

assert song->url != NULL

Browse Source
This commit is contained in:
Max Kellermann 2008-08-26 08:27:11 +02:00
parent e99333167e
commit df251a9960
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/player.c
View File

@ -39,6 +39,9 @@ int playerWait(int fd)
static void set_current_song(Song *song)
{
assert(song != NULL);
assert(song->url != NULL);
pc.fileTime = song->tag ? song->tag->time : 0;
pc.next_song = song;
}

4
src/player_thread.c
View File

@ -69,6 +69,7 @@ static int waitOnDecode(int *decodeWaitedOn)
}
if (dc.error != DECODE_ERROR_NOERROR) {
assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_FILE;
return -1;
@ -148,6 +149,7 @@ static void processDecodeInput(int *pause_r, unsigned int *bbp_r,
pc.state = PLAYER_STATE_PLAY;
} else {
char tmp[MPD_PATH_MAX];
assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_AUDIO;
ERROR("problems opening audio device "
@ -246,6 +248,7 @@ static void decodeParent(void)
decodeWaitedOn = 0;
if(openAudioDevice(&(ob.audioFormat))<0) {
char tmp[MPD_PATH_MAX];
assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_AUDIO;
ERROR("problems opening audio device "
@ -266,6 +269,7 @@ static void decodeParent(void)
}
else if(dc.state!=DECODE_STATE_START) {
/* the decoder failed */
assert(dc.next_song == NULL || dc.next_song->url != NULL);
pc.errored_song = dc.next_song;
pc.error = PLAYER_ERROR_FILE;
break;

3
src/song.c
View File

@ -316,6 +316,9 @@ char *get_song_url(char *path_max_tmp, Song *song)
{
if (!song)
return NULL;
assert(song->url != NULL);
if (!song->parentDir || !song->parentDir->path)
strcpy(path_max_tmp, song->url);
else