Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 2bdab523e5
Author: martii <you@example.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2012-08-16 22:05:33 +02:00
13 changed files with 59 additions and 12 deletions

View File

@@ -2,6 +2,7 @@
#ifndef _AUDIO_TD_H_
#define _AUDIO_TD_H_
#include "../common/cs_types.h"
typedef enum
{
@@ -79,7 +80,6 @@ class cAudio
int Stop(void);
bool Pause(bool Pcm = true);
void SetStreamType(AUDIO_FORMAT type);
#define AVSYNC_TYPE int
void SetSyncMode(AVSYNC_TYPE Mode);
/* select channels */