aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-03 19:16:25 +0100
committerMax Kellermann <max@duempel.org>2009-11-03 19:16:25 +0100
commit59ffb5b7c126194f3cb74129837961ee849933fa (patch)
tree126bb328b1df5ce1c44c839ad3ca065921620a9f /src
parent4dc25d3908648cc781fe43e54243bb64aec4b2cb (diff)
decoder_control: make the song objects const
They are just informational.
Diffstat (limited to 'src')
-rw-r--r--src/decoder_control.h4
-rw-r--r--src/decoder_thread.c2
-rw-r--r--src/player_control.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/decoder_control.h b/src/decoder_control.h
index d03c7a80..a4a6e266 100644
--- a/src/decoder_control.h
+++ b/src/decoder_control.h
@@ -72,8 +72,8 @@ struct decoder_control {
/** the format being sent to the music pipe */
struct audio_format out_audio_format;
- struct song *current_song;
- struct song *next_song;
+ const struct song *current_song;
+ const struct song *next_song;
float total_time;
/** the #music_chunk allocator */
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index 7308795c..2f643d45 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -263,7 +263,7 @@ decoder_run_song(struct decoder_control *dc,
static void
decoder_run(struct decoder_control *dc)
{
- struct song *song = dc->next_song;
+ const struct song *song = dc->next_song;
char *uri;
if (song_is_file(song))
diff --git a/src/player_control.h b/src/player_control.h
index c1fd52d8..02c04fda 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -108,7 +108,7 @@ struct player_control {
float total_time;
float elapsed_time;
struct song *volatile next_song;
- struct song *errored_song;
+ const struct song *errored_song;
volatile double seek_where;
float cross_fade_seconds;
double total_play_time;