Permalink
Browse files

Namespace cleanup: Prefix pcm_data with ds_

  • Loading branch information...
1 parent 0936c4b commit 167dae7c30a3fdce0c684b870a57bde0589fd8cb @SimonKagstrom committed Mar 13, 2011
@@ -17,7 +17,7 @@
static void* thread_loop(void* arg)
{
struct thread_state *ts = arg;
- struct pcm_data pcm;
+ struct ds_pcm_data pcm;
pthread_mutex_init(&ts->thread_mutex, NULL);
pthread_cond_init(&ts->thread_cond, NULL);
@@ -10,6 +10,6 @@
void* audio_init (void);
int audio_exit (void*);
-int audio_play_pcm(void*, struct pcm_data*);
+int audio_play_pcm(void*, struct ds_pcm_data*);
#endif
@@ -212,7 +212,7 @@ int audio_exit(void *private) {
}
-int audio_play_pcm (void* private, struct pcm_data* pcm) {
+int audio_play_pcm (void* private, struct ds_pcm_data* pcm) {
CoreAudioDevice *device = (CoreAudioDevice *)private;
int bytes_to_copy;
@@ -55,7 +55,7 @@ int audio_exit (void* device)
return 0;
}
-int audio_play_pcm (void* device, struct pcm_data* pcm)
+int audio_play_pcm (void* device, struct ds_pcm_data* pcm)
{
if (ao_play ((ao_device*)device, pcm->buf, pcm->len) == 0) {
DSFYDEBUG ("ao_play() failed\n");
@@ -58,7 +58,7 @@ static void thread_exit(void)
static void* thread_loop(void* arg)
{
struct despotify_session* ds = arg;
- struct pcm_data pcm;
+ struct ds_pcm_data pcm;
pthread_mutex_init(&thread_mutex, NULL);
pthread_cond_init(&thread_cond, NULL);
@@ -10,6 +10,6 @@
void* audio_init (void);
int audio_exit (void*);
-int audio_play_pcm(void*, struct pcm_data*);
+int audio_play_pcm(void*, struct ds_pcm_data*);
#endif
@@ -211,7 +211,7 @@ int audio_exit(void *private) {
}
-int audio_play_pcm (void* private, struct pcm_data* pcm) {
+int audio_play_pcm (void* private, struct ds_pcm_data* pcm) {
CoreAudioDevice *device = (CoreAudioDevice *)private;
int bytes_to_copy;
@@ -60,7 +60,7 @@ int audio_exit (void* device)
return 0;
}
-int audio_play_pcm (void* device, struct pcm_data* pcm)
+int audio_play_pcm (void* device, struct ds_pcm_data* pcm)
{
if (ao_play ((ao_device*)device, pcm->buf, pcm->len) == 0) {
DSFYDEBUG ("ao_play() failed\n");
@@ -71,7 +71,7 @@ static void thread_exit(void)
static void* thread_loop(void* arg)
{
struct despotify_session* ds = arg;
- struct pcm_data pcm;
+ struct ds_pcm_data pcm;
pthread_mutex_init(&thread_mutex, NULL);
pthread_cond_init(&thread_cond, NULL);
View
@@ -1636,7 +1636,7 @@ char* despotify_track_to_uri(struct ds_track* track, char* dest)
return dest;
}
-int despotify_get_pcm(struct despotify_session* ds, struct pcm_data* pcm)
+int despotify_get_pcm(struct despotify_session* ds, struct ds_pcm_data* pcm)
{
return snd_get_pcm(ds, pcm);
}
View
@@ -157,7 +157,7 @@ struct ds_snd_fifo /* internal use */
struct ds_snd_buffer* end; /* Last buffer */
};
-struct pcm_data
+struct ds_pcm_data
{
int samplerate;
int channels;
@@ -311,7 +311,7 @@ bool despotify_stop(struct despotify_session *ds);
struct ds_track* despotify_get_current_track(struct despotify_session* ds);
-int despotify_get_pcm(struct despotify_session*, struct pcm_data*);
+int despotify_get_pcm(struct despotify_session*, struct ds_pcm_data*);
/* URI utils */
struct ds_link* despotify_link_from_uri(char* uri);
View
@@ -451,7 +451,7 @@ int seek_func (void *session, ogg_int64_t offset, int whence)
return -1;
}
-int snd_get_pcm(struct despotify_session* ds, struct pcm_data* pcm)
+int snd_get_pcm(struct despotify_session* ds, struct ds_pcm_data* pcm)
{
if (!ds || !ds->fifo || !ds->fifo->start) {
pcm->len = 0;
View
@@ -75,5 +75,5 @@ size_t snd_ov_read_callback(void *ptr, size_t size, size_t nmemb, void* ds);
long snd_pcm_read(struct despotify_session* ds,
char *buffer, int length, int bigendianp,
int word, int sgned, int *bitstream);
-int snd_get_pcm(struct despotify_session*, struct pcm_data*);
+int snd_get_pcm(struct despotify_session*, struct ds_pcm_data*);
#endif

0 comments on commit 167dae7

Please sign in to comment.