aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-04-11 23:44:37 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-04-11 23:44:37 +0000
commitbbf84374a5893e076f6c1785f850f64d8fe69a3d (patch)
treec21df1e7647db7d0590a372b4544f8219a3f41de
parent26f72edc468b235ee735821be54856ccfce87fbd (diff)
downloadmpd-bbf84374a5893e076f6c1785f850f64d8fe69a3d.tar.gz
mpd-bbf84374a5893e076f6c1785f850f64d8fe69a3d.tar.xz
mpd-bbf84374a5893e076f6c1785f850f64d8fe69a3d.zip
more volatile stuff
git-svn-id: https://svn.musicpd.org/mpd/trunk@699 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/audio.h6
-rw-r--r--src/player.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/audio.h b/src/audio.h
index 917644f15..9a4bb10cf 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -28,9 +28,9 @@
#define AUDIO_AO_DRIVER_DEFAULT "default"
typedef struct _AudioFormat {
- mpd_sint8 channels;
- mpd_uint32 sampleRate;
- mpd_sint8 bits;
+ mpd_sint8 volatile channels;
+ mpd_uint32 volatile sampleRate;
+ mpd_sint8 volatile bits;
} AudioFormat;
void initAudioDriver();
diff --git a/src/player.h b/src/player.h
index 65ea07595..6e60dc274 100644
--- a/src/player.h
+++ b/src/player.h
@@ -51,13 +51,13 @@
#define PLAYER_QUEUE_LOCKED 1
typedef struct _PlayerControl {
- mpd_sint8 decodeType;
+ mpd_sint8 volatile decodeType;
mpd_sint8 volatile stop;
mpd_sint8 volatile play;
mpd_sint8 volatile pause;
mpd_sint8 volatile state;
mpd_sint8 volatile closeAudio;
- mpd_sint8 error;
+ mpd_sint8 volatile error;
mpd_uint16 bitRate;
mpd_sint8 bits;
mpd_sint8 channels;
@@ -72,7 +72,7 @@ typedef struct _PlayerControl {
mpd_sint8 volatile lockQueue;
mpd_sint8 volatile unlockQueue;
mpd_sint8 volatile seek;
- double seekWhere;
+ double volatile seekWhere;
float crossFade;
mpd_uint16 softwareVolume;
double totalPlayTime;