CPulseAudioClient: fix improper initialize error handling

[platform/core/api/audio-io.git] / include / CPulseAudioClient.h

diff --git a/include/CPulseAudioClient.h b/include/CPulseAudioClient.h
index af3f0c5..80bfb70 100644 (file)
--- a/include/CPulseAudioClient.h
+++ b/include/CPulseAudioClient.h
@@ -25,14 +25,11 @@
 
 
 namespace tizen_media_audio {
-
-
     /**
-     * PULSE Thread
+     * PULSE ThreadMainloop Locker
      */
-    class CPulseAudioVolume;
-    class CPulseAudioPolicy;
     class CPulseStreamSpec;
+
     class CPulseAudioClient {
     public:
         enum class EStreamDirection : unsigned int {
@@ -50,35 +47,33 @@ namespace tizen_media_audio {
         ~CPulseAudioClient();
 
         /* Implemented Methods */
-        void initialize() throw(CAudioError);
+        void initialize();
         void finalize();
 
         /* Methods */
-        int read(void* buffer, size_t length) throw(CAudioError);
-        int peek(const void** buffer, size_t* length) throw(CAudioError);
-        int drop() throw(CAudioError);
-        int write(const void* buffer, size_t length) throw(CAudioError);
+        int read(void* buffer, size_t length);
+        int peek(const void** buffer, size_t* length);
+        int drop();
+        int write(const void* buffer, size_t length);
 
-        void cork(bool cork) throw(CAudioError);
-        bool isCorked() throw(CAudioError);
+        void cork(bool cork);
+        bool isCorked();
 
-        bool drain() throw(CAudioError);
-        bool flush() throw(CAudioError);
+        bool drain();
+        bool flush();
 
-        void checkRunningState() throw(CAudioError);
-        bool isInThread() throw(CAudioError);
+        void checkRunningState();
+        bool isInThread() const;
 
-        size_t getWritableSize() throw(CAudioError);
-        size_t getReadableSize() throw(CAudioError);
+        size_t getWritableSize();
+        size_t getReadableSize();
 
-        size_t getBufferSize() throw(CAudioError);
+        size_t getBufferSize();
 
-        pa_usec_t getLatency() throw(CAudioError);
-        pa_usec_t getFinalLatency() throw(CAudioError);
+        pa_usec_t getLatency();
+        pa_usec_t getFinalLatency();
 
-        /* Setter & Getter */
-        EStreamDirection getStreamDirection();
-        CPulseStreamSpec getStreamSpec();
+        void applyRecordVolume(double volume);
 
     private:
         /* Members */
@@ -98,21 +93,38 @@ namespace tizen_media_audio {
         size_t                __mSyncReadIndex;
         size_t                __mSyncReadLength;
         bool                  __mIsUsedSyncRead;
+        bool                  __mIsFirstStream;
+        bool                  __mIsDraining;
+        bool                  __mIsStarted;
 
         /* Static Methods */
 
         /* Private Method */
+        void resetStreamCallbacks();
+        void resetInternalObjects();
 
-        /* Private Calblack Method */
+        /* Private Callback Method */
         static void __contextStateChangeCb(pa_context* c, void* user_data);
-        static void __successContextCb(pa_context* c, int success, void* user_data);
-
         static void __streamStateChangeCb(pa_stream* s, void* user_data);
         static void __streamCaptureCb(pa_stream* s, size_t length, void* user_data);
         static void __streamPlaybackCb(pa_stream* s, size_t length, void* user_data);
         static void __streamLatencyUpdateCb(pa_stream* s, void* user_data);
+        static void __streamStartedCb(pa_stream* s, void* user_data);
+        static void __streamUnderflowCb(pa_stream* s, void* user_data);
         static void __streamEventCb(pa_stream* s, const char *name, pa_proplist *pl, void *user_data);
         static void __successStreamCb(pa_stream* s, int success, void* user_data);
+        static void __successDrainCb(pa_stream* s, int success, void* user_data);
+        static void __successDrainCbInThread(pa_stream* s, int success, void* user_data);
+        static void __successVolumeCb(pa_context* c, int success, void* user_data);
+
+        class CPulseThreadLocker {
+        public:
+            explicit CPulseThreadLocker(pa_threaded_mainloop* mainloop);
+            virtual ~CPulseThreadLocker();
+
+        private:
+            const pa_threaded_mainloop* ml{};
+        };
     };