summaryrefslogtreecommitdiff
path: root/src/ui_act.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-02-01 13:35:50 +0100
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-02-01 13:35:50 +0100
commitc9e23f4e29f08fc53b2306311fa70b1cf4b78b0c (patch)
treecc0f87e31f8528d5eca1b2882449a7071d3cb92e /src/ui_act.c
parent516bc854369243b2f1ba4f1c019aca06cbbd736e (diff)
downloadpianobar-windows-c9e23f4e29f08fc53b2306311fa70b1cf4b78b0c.tar.gz
pianobar-windows-c9e23f4e29f08fc53b2306311fa70b1cf4b78b0c.tar.bz2
pianobar-windows-c9e23f4e29f08fc53b2306311fa70b1cf4b78b0c.zip
mp3 playback support
Now libfaad and/or libmad are used for playback. There's currently no remaining time displayed for mp3 playback.
Diffstat (limited to 'src/ui_act.c')
-rw-r--r--src/ui_act.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ui_act.c b/src/ui_act.c
index 5c28672..2ecc9c2 100644
--- a/src/ui_act.c
+++ b/src/ui_act.c
@@ -44,7 +44,7 @@ THE SOFTWARE.
/* helper to _really_ skip a song (unlock mutex, quit player)
* @param player handle
*/
-inline void BarUiDoSkipSong (struct aacPlayer *player) {
+inline void BarUiDoSkipSong (struct audioPlayer *player) {
player->doQuit = 1;
pthread_mutex_unlock (&player->pauseMutex);
}
@@ -178,6 +178,7 @@ void BarUiActSongInfo (BAR_KS_ARGS) {
printf ("Song infos:\n"
"album:\t%s\n"
"artist:\t%s\n"
+ "audioFormat:\t%i\n"
"audioUrl:\t%s\n"
"fileGain:\t%f\n"
"focusTraitId:\t%s\n"
@@ -188,12 +189,11 @@ void BarUiActSongInfo (BAR_KS_ARGS) {
"stationId:\t%s\n"
"title:\t%s\n"
"userSeed:\t%s\n",
- (*curSong)->album, (*curSong)->artist, (*curSong)->audioUrl,
- (*curSong)->fileGain, (*curSong)->focusTraitId,
- (*curSong)->identity, (*curSong)->matchingSeed,
- (*curSong)->musicId, (*curSong)->rating,
- (*curSong)->stationId, (*curSong)->title,
- (*curSong)->userSeed);
+ (*curSong)->album, (*curSong)->artist, (*curSong)->audioFormat,
+ (*curSong)->audioUrl, (*curSong)->fileGain,
+ (*curSong)->focusTraitId, (*curSong)->identity,
+ (*curSong)->matchingSeed, (*curSong)->musicId, (*curSong)->rating,
+ (*curSong)->stationId, (*curSong)->title, (*curSong)->userSeed);
}
/* rate current song