diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-13 18:01:06 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-13 18:01:06 +0200 |
| commit | f7ce4f6239ded6681713bc9e8d281712106e6f25 (patch) | |
| tree | 1078ee0df1551a0e27bae71022c39a54affd07b6 /src/player_thread.c | |
| parent | 28442cce9fa4a91c38d87c4a61b6ff6af4f97a67 (diff) | |
| download | mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.gz mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.xz mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.zip | |
song: renamed attribute "url" to "uri"
Diffstat (limited to 'src/player_thread.c')
| -rw-r--r-- | src/player_thread.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/player_thread.c b/src/player_thread.c index 6777d5d61..885cd2ce1 100644 --- a/src/player_thread.c +++ b/src/player_thread.c @@ -136,7 +136,7 @@ player_wait_for_decoder(struct player *player) dc_command_wait(&pc.notify); if (decoder_lock_has_failed()) { - assert(dc.next_song == NULL || dc.next_song->url != NULL); + assert(dc.next_song == NULL || dc.next_song->uri != NULL); pc.errored_song = dc.next_song; pc.error = PLAYER_ERROR_FILE; pc.next_song = NULL; @@ -177,7 +177,7 @@ player_check_decoder_startup(struct player *player) if (decoder_has_failed()) { /* the decoder failed */ - assert(dc.next_song == NULL || dc.next_song->url != NULL); + assert(dc.next_song == NULL || dc.next_song->uri != NULL); decoder_unlock(); @@ -209,7 +209,7 @@ player_check_decoder_startup(struct player *player) "while playing \"%s\"", uri); g_free(uri); - assert(dc.next_song == NULL || dc.next_song->url != NULL); + assert(dc.next_song == NULL || dc.next_song->uri != NULL); pc.errored_song = dc.next_song; pc.error = PLAYER_ERROR_AUDIO; @@ -375,7 +375,7 @@ static void player_process_command(struct player *player) } else { /* the audio device has failed - rollback to pause mode */ - assert(dc.next_song == NULL || dc.next_song->url != NULL); + assert(dc.next_song == NULL || dc.next_song->uri != NULL); pc.errored_song = dc.next_song; pc.error = PLAYER_ERROR_AUDIO; |