aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.h
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-02-27 01:35:23 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-02-27 01:35:23 +0000
commit9b1c5505973abffe1e3c3ab3ba7f84664fbf161f (patch)
treea4e393b11fce35995d218ccb451c165465c46a54 /src/player.h
parentce1d377d697036886ea13f9a66810bc70b748d90 (diff)
downloadmpd-9b1c5505973abffe1e3c3ab3ba7f84664fbf161f.tar.gz
mpd-9b1c5505973abffe1e3c3ab3ba7f84664fbf161f.tar.xz
mpd-9b1c5505973abffe1e3c3ab3ba7f84664fbf161f.zip
add xfade and audio to status, remove crossfade no args options
git-svn-id: https://svn.musicpd.org/mpd/trunk@75 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/player.h39
1 files changed, 25 insertions, 14 deletions
diff --git a/src/player.h b/src/player.h
index 43c136e3a..a50b799c8 100644
--- a/src/player.h
+++ b/src/player.h
@@ -19,6 +19,8 @@
#ifndef PLAYER_H
#define PLAYER_H
+#include "mpd_types.h"
+
#include <stdio.h>
#include <sys/param.h>
@@ -47,27 +49,30 @@
#define PLAYER_QUEUE_LOCKED 1
typedef struct _PlayerControl {
- int decodeType;
- int stop;
- int play;
- int pause;
- int state;
- int closeAudio;
- int error;
- unsigned long bitRate;
+ mpd_sint8 decodeType;
+ mpd_sint8 stop;
+ mpd_sint8 play;
+ mpd_sint8 pause;
+ mpd_sint8 state;
+ mpd_sint8 closeAudio;
+ mpd_sint8 error;
+ mpd_uint16 bitRate;
+ mpd_sint8 bits;
+ mpd_sint8 channels;
+ mpd_uint32 sampleRate;
float beginTime;
float totalTime;
float elapsedTime;
char file[MAXPATHLEN+1];
char erroredFile[MAXPATHLEN+1];
- int queueState;
- int queueLockState;
- int lockQueue;
- int unlockQueue;
- int seek;
+ mpd_sint8 queueState;
+ mpd_sint8 queueLockState;
+ mpd_sint8 lockQueue;
+ mpd_sint8 unlockQueue;
+ mpd_sint8 seek;
double seekWhere;
float crossFade;
- int softwareVolume;
+ mpd_sint8 softwareVolume;
double totalPlayTime;
} PlayerControl;
@@ -125,4 +130,10 @@ void setPlayerSoftwareVolume(int volume);
double getPlayerTotalPlayTime();
+unsigned int getPlayerSampleRate();
+
+int getPlayerBits();
+
+int getPlayerChannels();
+
#endif