libcoolstream2: sync headers

Origin commit data
------------------
Branch: ni/coolstream
Commit: 71b550b04b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-02-21 13:06:59 +04:00
parent 544a0cfe8a
commit ae7094cbe1
2 changed files with 5 additions and 3 deletions

View File

@@ -116,8 +116,8 @@ public:
void *GetHandle(void); void *GetHandle(void);
void *GetDSP(void); void *GetDSP(void);
void HandleAudioMessage(int Event, void *pData); void HandleAudioMessage(void *Handle, int Event, void *pData);
void HandlePcmMessage(int Event, void *pData); void HandlePcmMessage(void *Handle, int Event, void *pData);
/* shut up */ /* shut up */
int mute(void); int mute(void);
int unmute(void); int unmute(void);

View File

@@ -11,6 +11,7 @@
#define __CA_CS_H_ #define __CA_CS_H_
#include <OpenThreads/Thread> #include <OpenThreads/Thread>
#include <OpenThreads/Mutex>
#include <vector> #include <vector>
#include "cs_types.h" #include "cs_types.h"
@@ -114,6 +115,7 @@ class cCA : public OpenThreads::Thread {
private: private:
/// Static instance of the CA module /// Static instance of the CA module
static cCA *inst; static cCA *inst;
static OpenThreads::Mutex lock;
/// Private constructor (singleton method) /// Private constructor (singleton method)
cCA(void); cCA(void);
/// Private data for the CA module /// Private data for the CA module
@@ -160,7 +162,7 @@ public:
/// Notify the module with our answer (choice nr) /// Notify the module with our answer (choice nr)
void MenuAnswer(enum CA_SLOT_TYPE, u32 Slot, u32 choice); void MenuAnswer(enum CA_SLOT_TYPE, u32 Slot, u32 choice);
/// Notify the module with our answer (binary) /// Notify the module with our answer (binary)
void InputAnswer(enum CA_SLOT_TYPE, u32 Slot, u8 * Data, int Len); void InputAnswer(enum CA_SLOT_TYPE, u32 Slot, u8 * Data, int Len, bool Cancelled = false);
/// Notify the module we closed the menu /// Notify the module we closed the menu
void MenuClose(enum CA_SLOT_TYPE, u32 Slot); void MenuClose(enum CA_SLOT_TYPE, u32 Slot);
/// Get the supported CAIDs /// Get the supported CAIDs