From ae7094cbe1fdfbfb4d22525d132fc7874a9ab0f3 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 21 Feb 2014 13:06:59 +0400 Subject: [PATCH] libcoolstream2: sync headers Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/71b550b04b05b1a3ff40b2af7407d9e380a53f50 Author: [CST] Focus Date: 2014-02-21 (Fri, 21 Feb 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- lib/libcoolstream2/audio_cs.h | 4 ++-- lib/libcoolstream2/ca_cs.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libcoolstream2/audio_cs.h b/lib/libcoolstream2/audio_cs.h index 0574eb588..77ff55715 100644 --- a/lib/libcoolstream2/audio_cs.h +++ b/lib/libcoolstream2/audio_cs.h @@ -116,8 +116,8 @@ public: void *GetHandle(void); void *GetDSP(void); - void HandleAudioMessage(int Event, void *pData); - void HandlePcmMessage(int Event, void *pData); + void HandleAudioMessage(void *Handle, int Event, void *pData); + void HandlePcmMessage(void *Handle, int Event, void *pData); /* shut up */ int mute(void); int unmute(void); diff --git a/lib/libcoolstream2/ca_cs.h b/lib/libcoolstream2/ca_cs.h index ffb92dfac..3618281ef 100644 --- a/lib/libcoolstream2/ca_cs.h +++ b/lib/libcoolstream2/ca_cs.h @@ -11,6 +11,7 @@ #define __CA_CS_H_ #include +#include #include #include "cs_types.h" @@ -114,6 +115,7 @@ class cCA : public OpenThreads::Thread { private: /// Static instance of the CA module static cCA *inst; + static OpenThreads::Mutex lock; /// Private constructor (singleton method) cCA(void); /// Private data for the CA module @@ -160,7 +162,7 @@ public: /// Notify the module with our answer (choice nr) void MenuAnswer(enum CA_SLOT_TYPE, u32 Slot, u32 choice); /// 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 void MenuClose(enum CA_SLOT_TYPE, u32 Slot); /// Get the supported CAIDs