← Back to branch summary

~ubuntu-branches/ubuntu/wily/pianobar/wily-proposed

« back to all changes in this revision

Viewing changes to src/player.h

  • Committer: Bazaar Package Importer
  • Author(s): Luke Faraone
  • Date: 2011-07-09 10:03:03 UTC
  • mfrom: (1.3.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110709100303-m5heshhcrbrv3w3n
Tags: 2011.07.09-1
http://bugs.debian.org/633345
https://launchpad.net/bugs/807860
* New upstream version. 
  - XMLRPC api version bump (v31) (closes: #633345, LP: #807860)
* Update debian/watch for new location.
* Update symbols file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/player.h
35
35
#endif
36
36
 
37
37
#include <ao/ao.h>
 
38
/* required for freebsd */
 
39
#include <sys/types.h>
38
40
#include <pthread.h>
39
41
 
40
42
#include <piano.h>
41
43
#include <waitress.h>
42
44
 
 
45
#include "settings.h"
 
46
 
43
47
#define BAR_PLAYER_MS_TO_S_FACTOR 1000
44
48
 
45
49
struct audioPlayer {
97
101
 
98
102
        char doQuit;
99
103
        pthread_mutex_t pauseMutex;
 
104
 
 
105
        const BarSettings_t *settings;
100
106
};
101
107
 
102
108
enum {PLAYER_RET_OK = 0, PLAYER_RET_ERR = 1};