Apply tizen coding convention for C++ and header

[Version] 0.3.28
[Profile] Common
[Issue Type] Coding Convention

Change-Id: I194c66d59d6c1d679ed9a97d59a256f170fbd014

diff --git a/include/CAudioIO.h b/include/CAudioIO.h
index 37054dd..9db7e23 100644 (file)
--- a/include/CAudioIO.h
+++ b/include/CAudioIO.h
@@ -62,19 +62,19 @@ namespace tizen_media_audio {
         virtual ~CAudioIO();
 
         /* Pure Virtual Methods */
-        virtual void initialize() throw (CAudioError) = 0;
+        virtual void initialize() throw(CAudioError) = 0;
         virtual void finalize() = 0;
 
-        virtual void prepare() throw (CAudioError)   = 0;
-        virtual void unprepare() throw (CAudioError) = 0;
+        virtual void prepare() throw(CAudioError)   = 0;
+        virtual void unprepare() throw(CAudioError) = 0;
 
-        virtual void pause() throw (CAudioError) = 0;
-        virtual void resume() throw (CAudioError) = 0;
+        virtual void pause() throw(CAudioError) = 0;
+        virtual void resume() throw(CAudioError) = 0;
 
-        virtual void drain() throw (CAudioError) = 0;
-        virtual void flush() throw (CAudioError) = 0;
+        virtual void drain() throw(CAudioError) = 0;
+        virtual void flush() throw(CAudioError) = 0;
 
-        virtual int  getBufferSize() throw (CAudioError) = 0;
+        virtual int  getBufferSize() throw(CAudioError) = 0;
 
         /* Implemented Handlers */
         virtual void onStream(CPulseAudioClient* pClient, size_t length);
@@ -84,18 +84,18 @@ namespace tizen_media_audio {
         virtual void onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value);
 
         /* Methods */
-        CAudioInfo& getAudioInfo() throw (CAudioError);
+        CAudioInfo& getAudioInfo() throw(CAudioError);
 
-        virtual void setStreamCallback(SStreamCallback callback) throw (CAudioError);
-        SStreamCallback getStreamCallback() throw (CAudioError);
+        virtual void setStreamCallback(SStreamCallback callback) throw(CAudioError);
+        SStreamCallback getStreamCallback() throw(CAudioError);
 
-        virtual void setStateChangedCallback(SStateChangedCallback callback) throw (CAudioError);
-        SStateChangedCallback getStateChangedCallback() throw (CAudioError);
+        virtual void setStateChangedCallback(SStateChangedCallback callback) throw(CAudioError);
+        SStateChangedCallback getStateChangedCallback() throw(CAudioError);
 
-        void setInterruptCallback(SInterruptCallback callback) throw (CAudioError);
-        SInterruptCallback getInterruptCallback() throw (CAudioError);
+        void setInterruptCallback(SInterruptCallback callback) throw(CAudioError);
+        SInterruptCallback getInterruptCallback() throw(CAudioError);
 
-        void ignoreSession() throw (CAudioError);
+        void ignoreSession() throw(CAudioError);
 
     protected:
         /* Protected Methods */
@@ -103,10 +103,10 @@ namespace tizen_media_audio {
         virtual bool isInit();
         virtual bool IsReady();
 
-        void internalLock()   throw (CAudioError);
-        void internalUnlock() throw (CAudioError);
-        void internalWait()   throw (CAudioError);
-        void internalSignal() throw (CAudioError);
+        void internalLock()   throw(CAudioError);
+        void internalUnlock() throw(CAudioError);
+        void internalWait()   throw(CAudioError);
+        void internalSignal() throw(CAudioError);
 
         bool isForceIgnore();
 

diff --git a/include/CAudioIODef.h b/include/CAudioIODef.h
index 74bb000..04c2e55 100644 (file)
--- a/include/CAudioIODef.h
+++ b/include/CAudioIODef.h
@@ -103,7 +103,6 @@
 
 #define VALID_POINTER_START(_x_) { \
     if ((_x_) != NULL) {
-
 #define VALID_POINTER_END } \
 }
 

diff --git a/include/CAudioInfo.h b/include/CAudioInfo.h
index 0a24381..f79fe89 100644 (file)
--- a/include/CAudioInfo.h
+++ b/include/CAudioInfo.h
@@ -90,7 +90,7 @@ namespace tizen_media_audio {
 
         /* Constructors */
         CAudioInfo();
-        CAudioInfo(unsigned int sampleRate, EChannel channel, ESampleType sampleType, EAudioType audioType, int audioIndex) throw (CAudioError);
+        CAudioInfo(unsigned int sampleRate, EChannel channel, ESampleType sampleType, EAudioType audioType, int audioIndex) throw(CAudioError);
 
         /* Setter & Getter */
         unsigned int getSampleRate();
@@ -100,9 +100,9 @@ namespace tizen_media_audio {
         void setAudioType(EAudioType audioType);
         int getAudioIndex();
         void setAudioIndex(int audioIndex);
-        void convertAudioType2StreamType (CAudioInfo::EAudioType audioType, char **streamType);
-        void convertInputStreamType2AudioType (char *streamType, CAudioInfo::EAudioType *audioType);
-        void convertOutputStreamType2AudioType (char *streamType, CAudioInfo::EAudioType *audioType);
+        void convertAudioType2StreamType(CAudioInfo::EAudioType audioType, char **streamType);
+        void convertInputStreamType2AudioType(char *streamType, CAudioInfo::EAudioType *audioType);
+        void convertOutputStreamType2AudioType(char *streamType, CAudioInfo::EAudioType *audioType);
 
     private:
         const char *__STREAM_TYPE_TABLE[(unsigned int)EAudioType::AUDIO_TYPE_MAX] = {

diff --git a/include/CAudioInput.h b/include/CAudioInput.h
index 84db014..3511a67 100644 (file)
--- a/include/CAudioInput.h
+++ b/include/CAudioInput.h
@@ -44,27 +44,27 @@ namespace tizen_media_audio {
         virtual void onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value);
 
         /* Implemented Methods */
-        virtual void initialize() throw (CAudioError);
+        virtual void initialize() throw(CAudioError);
         virtual void finalize();
 
-        virtual void prepare() throw (CAudioError);
-        virtual void unprepare() throw (CAudioError);
+        virtual void prepare() throw(CAudioError);
+        virtual void unprepare() throw(CAudioError);
 
-        virtual void pause() throw (CAudioError);
-        virtual void resume() throw (CAudioError);
+        virtual void pause() throw(CAudioError);
+        virtual void resume() throw(CAudioError);
 
-        virtual void drain() throw (CAudioError);
-        virtual void flush() throw (CAudioError);
+        virtual void drain() throw(CAudioError);
+        virtual void flush() throw(CAudioError);
 
-        virtual int  getBufferSize() throw (CAudioError);
+        virtual int  getBufferSize() throw(CAudioError);
 
         /* Overridden Methods */
-        virtual void setStreamCallback(SStreamCallback callback) throw (CAudioError);
+        virtual void setStreamCallback(SStreamCallback callback) throw(CAudioError);
 
         /* Methods */
-        size_t read(void* buffer, size_t length) throw (CAudioError);
-        int peek(const void** buffer, size_t* length) throw (CAudioError);
-        int drop() throw (CAudioError);
+        size_t read(void* buffer, size_t length) throw(CAudioError);
+        int peek(const void** buffer, size_t* length) throw(CAudioError);
+        int drop() throw(CAudioError);
 
     private:
         /* Private Methods */

diff --git a/include/CAudioOutput.h b/include/CAudioOutput.h
index 6adb991..036a723 100644 (file)
--- a/include/CAudioOutput.h
+++ b/include/CAudioOutput.h
@@ -46,22 +46,22 @@ namespace tizen_media_audio {
         virtual void onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value);
 
         /* Implemented Methods */
-        virtual void initialize() throw (CAudioError);
+        virtual void initialize() throw(CAudioError);
         virtual void finalize();
 
-        virtual void prepare() throw (CAudioError);
-        virtual void unprepare() throw (CAudioError);
+        virtual void prepare() throw(CAudioError);
+        virtual void unprepare() throw(CAudioError);
 
-        virtual void pause() throw (CAudioError);
-        virtual void resume() throw (CAudioError);
+        virtual void pause() throw(CAudioError);
+        virtual void resume() throw(CAudioError);
 
-        virtual void drain() throw (CAudioError);
-        virtual void flush() throw (CAudioError);
+        virtual void drain() throw(CAudioError);
+        virtual void flush() throw(CAudioError);
 
-        virtual int  getBufferSize() throw (CAudioError);
+        virtual int  getBufferSize() throw(CAudioError);
 
         /* Methods */
-        size_t write(const void* buffer, size_t length) throw (CAudioError);
+        size_t write(const void* buffer, size_t length) throw(CAudioError);
 
     private:
         /* Private Methods */

diff --git a/include/CAudioSessionHandler.h b/include/CAudioSessionHandler.h
index 8c07c44..b51e0df 100644 (file)
--- a/include/CAudioSessionHandler.h
+++ b/include/CAudioSessionHandler.h
@@ -44,17 +44,17 @@ namespace tizen_media_audio {
         virtual ~CAudioSessionHandler();
 
         /* Methods */
-        virtual void initialize() throw (CAudioError);
+        virtual void initialize() throw(CAudioError);
         virtual void finalize();
 
-        bool isSkipSessionEvent() throw (CAudioError);
+        bool isSkipSessionEvent() throw(CAudioError);
 
-        void registerSound() throw (CAudioError);
-        void unregisterSound() throw (CAudioError);
+        void registerSound() throw(CAudioError);
+        void unregisterSound() throw(CAudioError);
 
-        void updatePlaying() throw (CAudioError);
-        void updateStop() throw (CAudioError);
-        void disableSessionHandler() throw (CAudioError);
+        void updatePlaying() throw(CAudioError);
+        void updateStop() throw(CAudioError);
+        void disableSessionHandler() throw(CAudioError);
 
         /* Setter & Getter */
         int getId();

diff --git a/include/CPulseAudioClient.h b/include/CPulseAudioClient.h
index 1dacc41..33a6681 100644 (file)
--- a/include/CPulseAudioClient.h
+++ b/include/CPulseAudioClient.h
@@ -50,31 +50,31 @@ namespace tizen_media_audio {
         ~CPulseAudioClient();
 
         /* Implemented Methods */
-        void initialize() throw (CAudioError);
+        void initialize() throw(CAudioError);
         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) 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);
 
-        void cork(bool cork) throw (CAudioError);
-        bool isCorked() throw (CAudioError);
+        void cork(bool cork) throw(CAudioError);
+        bool isCorked() throw(CAudioError);
 
-        bool drain() throw (CAudioError);
-        bool flush() throw (CAudioError);
+        bool drain() throw(CAudioError);
+        bool flush() throw(CAudioError);
 
-        void checkRunningState() throw (CAudioError);
-        bool isInThread() throw (CAudioError);
+        void checkRunningState() throw(CAudioError);
+        bool isInThread() throw(CAudioError);
 
-        size_t getWritableSize() throw (CAudioError);
-        size_t getReadableSize() throw (CAudioError);
+        size_t getWritableSize() throw(CAudioError);
+        size_t getReadableSize() throw(CAudioError);
 
-        size_t getBufferSize() throw (CAudioError);
+        size_t getBufferSize() throw(CAudioError);
 
-        pa_usec_t getLatency() throw (CAudioError);
-        pa_usec_t getFinalLatency() throw (CAudioError);
+        pa_usec_t getLatency() throw(CAudioError);
+        pa_usec_t getFinalLatency() throw(CAudioError);
 
         /* Setter & Getter */
         EStreamDirection getStreamDirection();

diff --git a/include/CPulseAudioPolicy.h b/include/CPulseAudioPolicy.h
index b9ef2d8..32548bb 100644 (file)
--- a/include/CPulseAudioPolicy.h
+++ b/include/CPulseAudioPolicy.h
@@ -51,7 +51,7 @@ namespace tizen_media_audio {
         ~CPulseAudioPolicy();
 
         /* getter & setter */
-        void setPolicy(EPolicy policy) throw (CAudioError);
+        void setPolicy(EPolicy policy) throw(CAudioError);
         EPolicy getPolicy();
 
         /* Override */

diff --git a/include/CPulseStreamSpec.h b/include/CPulseStreamSpec.h
index 7d9ed96..1c75259 100644 (file)
--- a/include/CPulseStreamSpec.h
+++ b/include/CPulseStreamSpec.h
@@ -46,9 +46,9 @@ namespace tizen_media_audio {
         };
 
         /* Constructor & Destructor */
-        CPulseStreamSpec() throw (CAudioError);
-        CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo) throw (CAudioError);
-        CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo, int customLatency) throw (CAudioError);
+        CPulseStreamSpec() throw(CAudioError);
+        CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo) throw(CAudioError);
+        CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo, int customLatency) throw(CAudioError);
         ~CPulseStreamSpec();
 
         /* Setter & Getter */
@@ -61,7 +61,7 @@ namespace tizen_media_audio {
 
     private:
         /* Private Methods */
-        void __adjustSpec() throw (CAudioError);
+        void __adjustSpec() throw(CAudioError);
 
         /* Members */
         EStreamLatency __mLatency;

diff --git a/include/audio_io.h b/include/audio_io.h
index 1446460..d99efe7 100644 (file)
--- a/include/audio_io.h
+++ b/include/audio_io.h
@@ -71,8 +71,8 @@ typedef struct audio_io_s *audio_out_h;
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum {
-    AUDIO_SAMPLE_TYPE_U8 = 0x70,    /**< Unsigned 8-bit audio samples */
-    AUDIO_SAMPLE_TYPE_S16_LE,       /**< Signed 16-bit audio samples */
+       AUDIO_SAMPLE_TYPE_U8 = 0x70,    /**< Unsigned 8-bit audio samples */
+       AUDIO_SAMPLE_TYPE_S16_LE,       /**< Signed 16-bit audio samples */
 } audio_sample_type_e;
 
 /**
@@ -80,8 +80,8 @@ typedef enum {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum {
-    AUDIO_CHANNEL_MONO = 0x80,                  /**< 1 channel, mono */
-    AUDIO_CHANNEL_STEREO,                       /**< 2 channel, stereo */
+       AUDIO_CHANNEL_MONO = 0x80,                  /**< 1 channel, mono */
+       AUDIO_CHANNEL_STEREO,                       /**< 2 channel, stereo */
 } audio_channel_e;
 
 /**
@@ -89,9 +89,9 @@ typedef enum {
  * @since_tizen 3.0
  */
 typedef enum {
-    AUDIO_IO_STATE_IDLE,      /**< Audio-io handle is created, but not prepared */
-    AUDIO_IO_STATE_RUNNING,   /**< Audio-io handle is ready and the stream is running */
-    AUDIO_IO_STATE_PAUSED,    /**< Audio-io handle is ready and the stream is paused */
+       AUDIO_IO_STATE_IDLE,      /**< Audio-io handle is created, but not prepared */
+       AUDIO_IO_STATE_RUNNING,   /**< Audio-io handle is ready and the stream is running */
+       AUDIO_IO_STATE_PAUSED,    /**< Audio-io handle is ready and the stream is paused */
 } audio_io_state_e;
 
 /**
@@ -99,18 +99,18 @@ typedef enum {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum {
-    AUDIO_IO_ERROR_NONE                = TIZEN_ERROR_NONE,              /**< Successful */
-    AUDIO_IO_ERROR_OUT_OF_MEMORY       = TIZEN_ERROR_OUT_OF_MEMORY,     /**< Out of memory */
-    AUDIO_IO_ERROR_INVALID_PARAMETER   = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-    AUDIO_IO_ERROR_INVALID_OPERATION   = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */
-    AUDIO_IO_ERROR_PERMISSION_DENIED   = TIZEN_ERROR_PERMISSION_DENIED, /**< Device open error by security */
-    AUDIO_IO_ERROR_NOT_SUPPORTED       = TIZEN_ERROR_NOT_SUPPORTED,     /**< Not supported */
-    AUDIO_IO_ERROR_DEVICE_NOT_OPENED   = TIZEN_ERROR_AUDIO_IO | 0x01,   /**< Device open error */
-    AUDIO_IO_ERROR_DEVICE_NOT_CLOSED   = TIZEN_ERROR_AUDIO_IO | 0x02,   /**< Device close error */
-    AUDIO_IO_ERROR_INVALID_BUFFER      = TIZEN_ERROR_AUDIO_IO | 0x03,   /**< Invalid buffer pointer */
-    AUDIO_IO_ERROR_SOUND_POLICY        = TIZEN_ERROR_AUDIO_IO | 0x04,   /**< Sound policy error */
-    AUDIO_IO_ERROR_INVALID_STATE       = TIZEN_ERROR_AUDIO_IO | 0x05,   /**< Invalid state (Since 3.0) */
-    AUDIO_IO_ERROR_NOT_SUPPORTED_TYPE  = TIZEN_ERROR_AUDIO_IO | 0x06,   /**< Not supported stream type (Since 3.0) */
+       AUDIO_IO_ERROR_NONE                = TIZEN_ERROR_NONE,              /**< Successful */
+       AUDIO_IO_ERROR_OUT_OF_MEMORY       = TIZEN_ERROR_OUT_OF_MEMORY,     /**< Out of memory */
+       AUDIO_IO_ERROR_INVALID_PARAMETER   = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+       AUDIO_IO_ERROR_INVALID_OPERATION   = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */
+       AUDIO_IO_ERROR_PERMISSION_DENIED   = TIZEN_ERROR_PERMISSION_DENIED, /**< Device open error by security */
+       AUDIO_IO_ERROR_NOT_SUPPORTED       = TIZEN_ERROR_NOT_SUPPORTED,     /**< Not supported */
+       AUDIO_IO_ERROR_DEVICE_NOT_OPENED   = TIZEN_ERROR_AUDIO_IO | 0x01,   /**< Device open error */
+       AUDIO_IO_ERROR_DEVICE_NOT_CLOSED   = TIZEN_ERROR_AUDIO_IO | 0x02,   /**< Device close error */
+       AUDIO_IO_ERROR_INVALID_BUFFER      = TIZEN_ERROR_AUDIO_IO | 0x03,   /**< Invalid buffer pointer */
+       AUDIO_IO_ERROR_SOUND_POLICY        = TIZEN_ERROR_AUDIO_IO | 0x04,   /**< Sound policy error */
+       AUDIO_IO_ERROR_INVALID_STATE       = TIZEN_ERROR_AUDIO_IO | 0x05,   /**< Invalid state (Since 3.0) */
+       AUDIO_IO_ERROR_NOT_SUPPORTED_TYPE  = TIZEN_ERROR_AUDIO_IO | 0x06,   /**< Not supported stream type (Since 3.0) */
 } audio_io_error_e;
 
 /**
@@ -119,14 +119,14 @@ typedef enum {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum {
-    AUDIO_IO_INTERRUPTED_COMPLETED = 0,         /**< Interrupt completed */
-    AUDIO_IO_INTERRUPTED_BY_MEDIA,              /**< Interrupted by a media application */
-    AUDIO_IO_INTERRUPTED_BY_CALL,               /**< Interrupted by an incoming call */
-    AUDIO_IO_INTERRUPTED_BY_EARJACK_UNPLUG,     /**< Interrupted by unplugging headphones */
-    AUDIO_IO_INTERRUPTED_BY_RESOURCE_CONFLICT,  /**< Interrupted by a resource conflict */
-    AUDIO_IO_INTERRUPTED_BY_ALARM,              /**< Interrupted by an alarm */
-    AUDIO_IO_INTERRUPTED_BY_EMERGENCY,          /**< Interrupted by an emergency */
-    AUDIO_IO_INTERRUPTED_BY_NOTIFICATION,       /**< Interrupted by a notification */
+       AUDIO_IO_INTERRUPTED_COMPLETED = 0,         /**< Interrupt completed */
+       AUDIO_IO_INTERRUPTED_BY_MEDIA,              /**< Interrupted by a media application */
+       AUDIO_IO_INTERRUPTED_BY_CALL,               /**< Interrupted by an incoming call */
+       AUDIO_IO_INTERRUPTED_BY_EARJACK_UNPLUG,     /**< Interrupted by unplugging headphones */
+       AUDIO_IO_INTERRUPTED_BY_RESOURCE_CONFLICT,  /**< Interrupted by a resource conflict */
+       AUDIO_IO_INTERRUPTED_BY_ALARM,              /**< Interrupted by an alarm */
+       AUDIO_IO_INTERRUPTED_BY_EMERGENCY,          /**< Interrupted by an emergency */
+       AUDIO_IO_INTERRUPTED_BY_NOTIFICATION,       /**< Interrupted by a notification */
 } audio_io_interrupted_code_e;
 
 /**

diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index 0378f57..5f2cc6b 100644 (file)
--- a/packaging/capi-media-audio-io.spec
+++ b/packaging/capi-media-audio-io.spec
@@ -1,6 +1,6 @@
 Name:           capi-media-audio-io
 Summary:        An Audio Input & Audio Output library in Tizen Native API
-Version:        0.3.27
+Version:        0.3.28
 Release:        0
 Group:          Multimedia/API
 License:        Apache-2.0

diff --git a/src/cpp/CAudioIO.cpp b/src/cpp/CAudioIO.cpp
index 1f875b2..dbe16bd 100644 (file)
--- a/src/cpp/CAudioIO.cpp
+++ b/src/cpp/CAudioIO.cpp
@@ -69,7 +69,7 @@ bool CAudioIO::IsReady() {
     return ((mState == CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING || mState == CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED)? true : false);
 }
 
-void CAudioIO::internalLock() throw (CAudioError) {
+void CAudioIO::internalLock() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -82,7 +82,7 @@ void CAudioIO::internalLock() throw (CAudioError) {
 #endif
 }
 
-void CAudioIO::internalUnlock() throw (CAudioError) {
+void CAudioIO::internalUnlock() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -95,7 +95,7 @@ void CAudioIO::internalUnlock() throw (CAudioError) {
 #endif
 }
 
-void CAudioIO::internalWait() throw (CAudioError) {
+void CAudioIO::internalWait() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -107,7 +107,7 @@ void CAudioIO::internalWait() throw (CAudioError) {
     pthread_cond_wait(&__mCond, &__mMutex);
 }
 
-void CAudioIO::internalSignal() throw (CAudioError) {
+void CAudioIO::internalSignal() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -123,7 +123,7 @@ bool CAudioIO::isForceIgnore() {
     return __mForceIgnore;
 }
 
-void CAudioIO::initialize() throw (CAudioError) {
+void CAudioIO::initialize() throw(CAudioError) {
     if (__mIsInit == true) {
         return;
     }
@@ -302,7 +302,7 @@ void CAudioIO::onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t s
     }
 }
 
-void CAudioIO::prepare() throw (CAudioError) {
+void CAudioIO::prepare() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -315,7 +315,7 @@ void CAudioIO::prepare() throw (CAudioError) {
     }
 }
 
-void CAudioIO::unprepare() throw (CAudioError) {
+void CAudioIO::unprepare() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -328,7 +328,7 @@ void CAudioIO::unprepare() throw (CAudioError) {
     }
 }
 
-void CAudioIO::pause() throw (CAudioError) {
+void CAudioIO::pause() throw(CAudioError) {
     if (__mIsInit == false || IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioIO");
     }
@@ -344,7 +344,7 @@ void CAudioIO::pause() throw (CAudioError) {
     }
 }
 
-void CAudioIO::resume() throw (CAudioError) {
+void CAudioIO::resume() throw(CAudioError) {
     if (__mIsInit == false || IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioIO");
     }
@@ -360,7 +360,7 @@ void CAudioIO::resume() throw (CAudioError) {
     }
 }
 
-void CAudioIO::drain() throw (CAudioError) {
+void CAudioIO::drain() throw(CAudioError) {
     if (__mIsInit == false || IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioIO");
     }
@@ -376,7 +376,7 @@ void CAudioIO::drain() throw (CAudioError) {
     }
 }
 
-void CAudioIO::flush() throw (CAudioError) {
+void CAudioIO::flush() throw(CAudioError) {
     if (__mIsInit == false || IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioIO");
     }
@@ -392,7 +392,7 @@ void CAudioIO::flush() throw (CAudioError) {
     }
 }
 
-CAudioInfo& CAudioIO::getAudioInfo() throw (CAudioError) {
+CAudioInfo& CAudioIO::getAudioInfo() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -400,7 +400,7 @@ CAudioInfo& CAudioIO::getAudioInfo() throw (CAudioError) {
     return mAudioInfo;
 }
 
-void CAudioIO::setStreamCallback(SStreamCallback callback) throw (CAudioError) {
+void CAudioIO::setStreamCallback(SStreamCallback callback) throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -408,7 +408,7 @@ void CAudioIO::setStreamCallback(SStreamCallback callback) throw (CAudioError) {
     mStreamCallback = callback;
 }
 
-CAudioIO::SStreamCallback CAudioIO::getStreamCallback() throw (CAudioError) {
+CAudioIO::SStreamCallback CAudioIO::getStreamCallback() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -416,7 +416,7 @@ CAudioIO::SStreamCallback CAudioIO::getStreamCallback() throw (CAudioError) {
     return mStreamCallback;
 }
 
-void CAudioIO::setStateChangedCallback(SStateChangedCallback callback) throw (CAudioError) {
+void CAudioIO::setStateChangedCallback(SStateChangedCallback callback) throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -424,7 +424,7 @@ void CAudioIO::setStateChangedCallback(SStateChangedCallback callback) throw (CA
     mStateChangedCallback = callback;
 }
 
-CAudioIO::SStateChangedCallback CAudioIO::getStateChangedCallback() throw (CAudioError) {
+CAudioIO::SStateChangedCallback CAudioIO::getStateChangedCallback() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -432,7 +432,7 @@ CAudioIO::SStateChangedCallback CAudioIO::getStateChangedCallback() throw (CAudi
     return mStateChangedCallback;
 }
 
-void CAudioIO::setInterruptCallback(SInterruptCallback callback) throw (CAudioError) {
+void CAudioIO::setInterruptCallback(SInterruptCallback callback) throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -440,7 +440,7 @@ void CAudioIO::setInterruptCallback(SInterruptCallback callback) throw (CAudioEr
     mInterruptCallback = callback;
 }
 
-CAudioIO::SInterruptCallback CAudioIO::getInterruptCallback() throw (CAudioError) {
+CAudioIO::SInterruptCallback CAudioIO::getInterruptCallback() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }
@@ -449,7 +449,7 @@ CAudioIO::SInterruptCallback CAudioIO::getInterruptCallback() throw (CAudioError
 }
 
 
-void CAudioIO::ignoreSession() throw (CAudioError) {
+void CAudioIO::ignoreSession() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioIO");
     }

diff --git a/src/cpp/CAudioInfo.cpp b/src/cpp/CAudioInfo.cpp
index 4cb002d..0e2f96d 100644 (file)
--- a/src/cpp/CAudioInfo.cpp
+++ b/src/cpp/CAudioInfo.cpp
@@ -34,7 +34,7 @@ CAudioInfo::CAudioInfo() :
     __mAudioIndex(-1) {
 }
 
-CAudioInfo::CAudioInfo(unsigned int sampleRate, EChannel channel, ESampleType sampleType, EAudioType audioType, int audioIndex) throw (CAudioError) :
+CAudioInfo::CAudioInfo(unsigned int sampleRate, EChannel channel, ESampleType sampleType, EAudioType audioType, int audioIndex) throw(CAudioError) :
     __mSampleRate(sampleRate),
     __mChannel(channel),
     __mSampleType(sampleType),
@@ -88,7 +88,7 @@ void CAudioInfo::setAudioIndex(int audioIndex) {
     return;
 }
 
-void CAudioInfo::convertAudioType2StreamType (CAudioInfo::EAudioType audioType, char **streamType) {
+void CAudioInfo::convertAudioType2StreamType(CAudioInfo::EAudioType audioType, char **streamType) {
     if (audioType < CAudioInfo::EAudioType::AUDIO_IN_TYPE_MEDIA || audioType >= CAudioInfo::EAudioType::AUDIO_TYPE_MAX) {
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_SUPPORTED_TYPE, "The audioType is not supported [audioType:%d]", audioType);
     }
@@ -96,7 +96,7 @@ void CAudioInfo::convertAudioType2StreamType (CAudioInfo::EAudioType audioType,
     return;
 }
 
-void CAudioInfo::convertInputStreamType2AudioType (char *streamType, CAudioInfo::EAudioType *audioType) {
+void CAudioInfo::convertInputStreamType2AudioType(char *streamType, CAudioInfo::EAudioType *audioType) {
     for (unsigned int i = (unsigned int)CAudioInfo::EAudioType::AUDIO_IN_TYPE_MEDIA ; i < (unsigned int)CAudioInfo::EAudioType::AUDIO_OUT_TYPE_MEDIA ; i++) {
         if (!strcmp((char *)__STREAM_TYPE_TABLE[i], streamType)) {
             *audioType = (CAudioInfo::EAudioType)i;
@@ -107,7 +107,7 @@ void CAudioInfo::convertInputStreamType2AudioType (char *streamType, CAudioInfo:
     return;
 }
 
-void CAudioInfo::convertOutputStreamType2AudioType (char *streamType, CAudioInfo::EAudioType *audioType) {
+void CAudioInfo::convertOutputStreamType2AudioType(char *streamType, CAudioInfo::EAudioType *audioType) {
     for (unsigned int i = (unsigned int)CAudioInfo::EAudioType::AUDIO_OUT_TYPE_MEDIA ; i < (unsigned int)CAudioInfo::EAudioType::AUDIO_TYPE_MAX ; i++) {
         if (!strcmp((char *)__STREAM_TYPE_TABLE[i], streamType)) {
             *audioType = (CAudioInfo::EAudioType)i;

diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp
index 828cdda..453b846 100644 (file)
--- a/src/cpp/CAudioInput.cpp
+++ b/src/cpp/CAudioInput.cpp
@@ -91,7 +91,7 @@ bool CAudioInput::__IsReady() {
     return CAudioIO::IsReady();
 }
 
-void CAudioInput::initialize() throw (CAudioError) {
+void CAudioInput::initialize() throw(CAudioError) {
     if (__IsInit() == true) {
         return;
     }
@@ -130,7 +130,7 @@ void CAudioInput::finalize() {
     __setInit(false);
 }
 
-void CAudioInput::prepare() throw (CAudioError) {
+void CAudioInput::prepare() throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
     }
@@ -187,7 +187,7 @@ void CAudioInput::prepare() throw (CAudioError) {
     }
 }
 
-void CAudioInput::unprepare() throw (CAudioError) {
+void CAudioInput::unprepare() throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
     }
@@ -197,7 +197,7 @@ void CAudioInput::unprepare() throw (CAudioError) {
         return;
     }
 
-    try{
+    try {
         // Do unprepare
         CAudioIO::unprepare();
 
@@ -227,12 +227,12 @@ void CAudioInput::unprepare() throw (CAudioError) {
     }
 }
 
-void CAudioInput::pause() throw (CAudioError) {
+void CAudioInput::pause() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput");
     }
 
-    try{
+    try {
         CAudioIO::pause();
 
         internalLock();
@@ -251,7 +251,7 @@ void CAudioInput::pause() throw (CAudioError) {
     }
 }
 
-void CAudioInput::resume() throw (CAudioError) {
+void CAudioInput::resume() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput");
     }
@@ -260,7 +260,6 @@ void CAudioInput::resume() throw (CAudioError) {
         internalLock();
 
         if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) {
-
             /* Updates ASM to PLAYING */
             mpAudioSessionHandler->updatePlaying();
         }
@@ -276,11 +275,11 @@ void CAudioInput::resume() throw (CAudioError) {
     }
 }
 
-void CAudioInput::drain() throw (CAudioError) {
+void CAudioInput::drain() throw(CAudioError) {
     THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_SUPPORTED, "Did not support drain of CAudioInput");
 }
 
-void CAudioInput::flush() throw (CAudioError) {
+void CAudioInput::flush() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput");
     }
@@ -292,7 +291,7 @@ void CAudioInput::flush() throw (CAudioError) {
     }
 }
 
-int CAudioInput::getBufferSize() throw (CAudioError) {
+int CAudioInput::getBufferSize() throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
     }
@@ -313,7 +312,7 @@ int CAudioInput::getBufferSize() throw (CAudioError) {
     return size;
 }
 
-void CAudioInput::setStreamCallback(SStreamCallback callback) throw (CAudioError) {
+void CAudioInput::setStreamCallback(SStreamCallback callback) throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
     }
@@ -329,7 +328,7 @@ void CAudioInput::setStreamCallback(SStreamCallback callback) throw (CAudioError
     CAudioIO::setStreamCallback(callback);
 }
 
-size_t CAudioInput::read(void* buffer, size_t length) throw (CAudioError) {
+size_t CAudioInput::read(void* buffer, size_t length) throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput");
     }
@@ -355,7 +354,7 @@ size_t CAudioInput::read(void* buffer, size_t length) throw (CAudioError) {
     return ret;
 }
 
-int CAudioInput::peek(const void** buffer, size_t* length) throw (CAudioError) {
+int CAudioInput::peek(const void** buffer, size_t* length) throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput");
     }
@@ -380,7 +379,7 @@ int CAudioInput::peek(const void** buffer, size_t* length) throw (CAudioError) {
     return ret;
 }
 
-int CAudioInput::drop() throw (CAudioError) {
+int CAudioInput::drop() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput");
     }

diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp
index c1498dd..2f70ed6 100644 (file)
--- a/src/cpp/CAudioOutput.cpp
+++ b/src/cpp/CAudioOutput.cpp
@@ -92,7 +92,7 @@ bool CAudioOutput::__IsReady() {
     return CAudioIO::IsReady();
 }
 
-void CAudioOutput::initialize() throw (CAudioError) {
+void CAudioOutput::initialize() throw(CAudioError) {
     if (__IsInit() == true) {
         return;
     }
@@ -131,7 +131,7 @@ void CAudioOutput::finalize() {
     __setInit(false);
 }
 
-void CAudioOutput::prepare() throw (CAudioError) {
+void CAudioOutput::prepare() throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioOutput");
     }
@@ -186,7 +186,7 @@ void CAudioOutput::prepare() throw (CAudioError) {
     }
 }
 
-void CAudioOutput::unprepare() throw (CAudioError) {
+void CAudioOutput::unprepare() throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioOutput");
     }
@@ -225,7 +225,7 @@ void CAudioOutput::unprepare() throw (CAudioError) {
     }
 }
 
-void CAudioOutput::pause() throw (CAudioError) {
+void CAudioOutput::pause() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioOutput");
     }
@@ -249,7 +249,7 @@ void CAudioOutput::pause() throw (CAudioError) {
     }
 }
 
-void CAudioOutput::resume() throw (CAudioError) {
+void CAudioOutput::resume() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioOutput");
     }
@@ -258,7 +258,6 @@ void CAudioOutput::resume() throw (CAudioError) {
         internalLock();
 
         if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) {
-
             /* Updates ASM to PLAYING */
             mpAudioSessionHandler->updatePlaying();
         }
@@ -274,7 +273,7 @@ void CAudioOutput::resume() throw (CAudioError) {
     }
 }
 
-void CAudioOutput::drain() throw (CAudioError) {
+void CAudioOutput::drain() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioOutput");
     }
@@ -286,7 +285,7 @@ void CAudioOutput::drain() throw (CAudioError) {
     }
 }
 
-void CAudioOutput::flush() throw (CAudioError) {
+void CAudioOutput::flush() throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioOutput");
     }
@@ -298,7 +297,7 @@ void CAudioOutput::flush() throw (CAudioError) {
     }
 }
 
-int CAudioOutput::getBufferSize() throw (CAudioError) {
+int CAudioOutput::getBufferSize() throw(CAudioError) {
     if (__IsInit() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioOutput");
     }
@@ -319,7 +318,7 @@ int CAudioOutput::getBufferSize() throw (CAudioError) {
     return size;
 }
 
-size_t CAudioOutput::write(const void* buffer, size_t length) throw (CAudioError) {
+size_t CAudioOutput::write(const void* buffer, size_t length) throw(CAudioError) {
     if (__IsInit() == false || __IsReady() == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioOutput");
     }

diff --git a/src/cpp/CAudioSessionHandler.cpp b/src/cpp/CAudioSessionHandler.cpp
index b9f050a..7895e31 100644 (file)
--- a/src/cpp/CAudioSessionHandler.cpp
+++ b/src/cpp/CAudioSessionHandler.cpp
@@ -195,7 +195,7 @@ void CAudioSessionHandler::__sound_pcm_signal_cb(mm_sound_signal_name_t signal,
     }
 }
 
-void CAudioSessionHandler::initialize() throw (CAudioError) {
+void CAudioSessionHandler::initialize() throw(CAudioError) {
     AUDIO_IO_LOGD("");
     if (__mIsInit == true) {
         return;
@@ -272,7 +272,7 @@ void CAudioSessionHandler::finalize() {
     __mIsInit = false;
 }
 
-bool CAudioSessionHandler::isSkipSessionEvent() throw (CAudioError) {
+bool CAudioSessionHandler::isSkipSessionEvent() throw(CAudioError) {
     bool ret = false;
 
     // To be regarded...
@@ -281,7 +281,6 @@ bool CAudioSessionHandler::isSkipSessionEvent() throw (CAudioError) {
     if (mEvent != ASM_EVENT_CALL              && mEvent != ASM_EVENT_VOIP              &&
         mEvent != ASM_EVENT_VIDEOCALL         && mEvent != ASM_EVENT_VOICE_RECOGNITION &&
         mEvent != ASM_EVENT_MMCAMCORDER_AUDIO && mEvent != ASM_EVENT_MMCAMCORDER_VIDEO) {
-
         // Check AudioType
         switch (__mAudioInfo.getAudioType()) {
         case CAudioInfo::AUDIO_IN_TYPE_MEDIA:
@@ -340,7 +339,7 @@ void CAudioSessionHandler::__sound_pcm_focus_watch_cb(int id, mm_sound_focus_typ
     return;
 }
 
-void CAudioSessionHandler::registerSound() throw (CAudioError) {
+void CAudioSessionHandler::registerSound() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioSessionHandler");
     }
@@ -391,7 +390,7 @@ void CAudioSessionHandler::registerSound() throw (CAudioError) {
     }
 }
 
-void CAudioSessionHandler::unregisterSound() throw (CAudioError) {
+void CAudioSessionHandler::unregisterSound() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioSessionHandler");
     }
@@ -429,7 +428,7 @@ void CAudioSessionHandler::unregisterSound() throw (CAudioError) {
     }
 }
 
-void CAudioSessionHandler::updatePlaying() throw (CAudioError) {
+void CAudioSessionHandler::updatePlaying() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioSessionHandler");
     }
@@ -445,7 +444,7 @@ void CAudioSessionHandler::updatePlaying() throw (CAudioError) {
     }
 }
 
-void CAudioSessionHandler::updateStop() throw (CAudioError) {
+void CAudioSessionHandler::updateStop() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Doesn't initialize CAudioSessionHandler");
     }
@@ -461,7 +460,7 @@ void CAudioSessionHandler::updateStop() throw (CAudioError) {
     }
 }
 
-void CAudioSessionHandler::disableSessionHandler() throw (CAudioError) {
+void CAudioSessionHandler::disableSessionHandler() throw(CAudioError) {
     CAudioSessionHandler::updateStop();
     CAudioSessionHandler::unregisterSound();
 

diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp
index 97be638..8d788d3 100644 (file)
--- a/src/cpp/CPulseAudioClient.cpp
+++ b/src/cpp/CPulseAudioClient.cpp
@@ -166,7 +166,7 @@ void CPulseAudioClient::__successStreamCb(pa_stream* s, int success, void* user_
     pa_threaded_mainloop_signal(pClient->__mpMainloop, 0);
 }
 
-void CPulseAudioClient::initialize() throw (CAudioError) {
+void CPulseAudioClient::initialize() throw(CAudioError) {
     AUDIO_IO_LOGD("");
     if (__mIsInit == true) {
         return;
@@ -351,7 +351,7 @@ void CPulseAudioClient::finalize() {
     __mIsInit = false;
 }
 
-int CPulseAudioClient::read(void* buffer, size_t length) throw (CAudioError) {
+int CPulseAudioClient::read(void* buffer, size_t length) throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -446,7 +446,7 @@ int CPulseAudioClient::read(void* buffer, size_t length) throw (CAudioError) {
     return length;
 }
 
-int CPulseAudioClient::peek(const void** buffer, size_t* length) throw (CAudioError) {
+int CPulseAudioClient::peek(const void** buffer, size_t* length) throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -482,7 +482,7 @@ int CPulseAudioClient::peek(const void** buffer, size_t* length) throw (CAudioEr
     return ret;
 }
 
-int CPulseAudioClient::drop() throw (CAudioError) {
+int CPulseAudioClient::drop() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -514,7 +514,7 @@ int CPulseAudioClient::drop() throw (CAudioError) {
     return ret;
 }
 
-int CPulseAudioClient::write(const void* data, size_t length) throw (CAudioError) {
+int CPulseAudioClient::write(const void* data, size_t length) throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -550,7 +550,7 @@ int CPulseAudioClient::write(const void* data, size_t length) throw (CAudioError
     return ret;
 }
 
-void CPulseAudioClient::cork(bool cork) throw (CAudioError) {
+void CPulseAudioClient::cork(bool cork) throw(CAudioError) {
     AUDIO_IO_LOGD("cork[%d]", cork);
 
     if (__mIsInit == false) {
@@ -574,7 +574,7 @@ void CPulseAudioClient::cork(bool cork) throw (CAudioError) {
     return;
 }
 
-bool CPulseAudioClient::isCorked() throw (CAudioError) {
+bool CPulseAudioClient::isCorked() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -595,7 +595,7 @@ bool CPulseAudioClient::isCorked() throw (CAudioError) {
     return static_cast<bool>(isCork);
 }
 
-bool CPulseAudioClient::drain() throw (CAudioError) {
+bool CPulseAudioClient::drain() throw(CAudioError) {
     AUDIO_IO_LOGD("drain");
 
     if (__mIsInit == false) {
@@ -615,7 +615,7 @@ bool CPulseAudioClient::drain() throw (CAudioError) {
     return true;
 }
 
-bool CPulseAudioClient::flush() throw (CAudioError) {
+bool CPulseAudioClient::flush() throw(CAudioError) {
     AUDIO_IO_LOGD("flush");
 
     if (__mIsInit == false) {
@@ -635,7 +635,7 @@ bool CPulseAudioClient::flush() throw (CAudioError) {
     return true;
 }
 
-size_t CPulseAudioClient::getWritableSize() throw (CAudioError) {
+size_t CPulseAudioClient::getWritableSize() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -659,7 +659,7 @@ size_t CPulseAudioClient::getWritableSize() throw (CAudioError) {
     return ret;
 }
 
-void CPulseAudioClient::checkRunningState() throw (CAudioError) {
+void CPulseAudioClient::checkRunningState() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -679,7 +679,7 @@ void CPulseAudioClient::checkRunningState() throw (CAudioError) {
 #endif
 }
 
-bool CPulseAudioClient::isInThread() throw (CAudioError) {
+bool CPulseAudioClient::isInThread() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -692,7 +692,7 @@ bool CPulseAudioClient::isInThread() throw (CAudioError) {
     return static_cast<bool>(ret);
 }
 
-size_t CPulseAudioClient::getReadableSize() throw (CAudioError) {
+size_t CPulseAudioClient::getReadableSize() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -716,7 +716,7 @@ size_t CPulseAudioClient::getReadableSize() throw (CAudioError) {
     return ret;
 }
 
-size_t CPulseAudioClient::getBufferSize() throw (CAudioError) {
+size_t CPulseAudioClient::getBufferSize() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -757,7 +757,7 @@ size_t CPulseAudioClient::getBufferSize() throw (CAudioError) {
     return ret;
 }
 
-pa_usec_t CPulseAudioClient::getLatency() throw (CAudioError) {
+pa_usec_t CPulseAudioClient::getLatency() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }
@@ -803,7 +803,7 @@ pa_usec_t CPulseAudioClient::getLatency() throw (CAudioError) {
     return negative ? 0 : ret;
 }
 
-pa_usec_t CPulseAudioClient::getFinalLatency() throw (CAudioError) {
+pa_usec_t CPulseAudioClient::getFinalLatency() throw(CAudioError) {
     if (__mIsInit == false) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient");
     }

diff --git a/src/cpp/CPulseAudioPolicy.cpp b/src/cpp/CPulseAudioPolicy.cpp
index 12a6bb4..5fa67f1 100644 (file)
--- a/src/cpp/CPulseAudioPolicy.cpp
+++ b/src/cpp/CPulseAudioPolicy.cpp
@@ -37,7 +37,7 @@ CPulseAudioPolicy::CPulseAudioPolicy(EPolicy policy) :
 CPulseAudioPolicy::~CPulseAudioPolicy() {
 }
 
-void CPulseAudioPolicy::setPolicy(EPolicy policy) throw (CAudioError) {
+void CPulseAudioPolicy::setPolicy(EPolicy policy) throw(CAudioError) {
     if (policy < EPolicy::POLICY_DEFAULT || policy >= EPolicy::POLICY_MAX) {
         THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_ARGUMENT, "The argument is out of range");
     }

diff --git a/src/cpp/CPulseStreamSpec.cpp b/src/cpp/CPulseStreamSpec.cpp
index b40771d..0e7f8a4 100644 (file)
--- a/src/cpp/CPulseStreamSpec.cpp
+++ b/src/cpp/CPulseStreamSpec.cpp
@@ -38,20 +38,20 @@ static const char* STREAM_LATENCY_HIGH = "high";
 static const char* STREAM_LATENCY_VOIP = "voip";
 
 
-CPulseStreamSpec::CPulseStreamSpec() throw (CAudioError) :
+CPulseStreamSpec::CPulseStreamSpec() throw(CAudioError) :
     __mLatency(EStreamLatency::STREAM_LATENCY_INPUT_MID),
     __mStreamName(NULL) {
     __adjustSpec();
 }
 
-CPulseStreamSpec::CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo) throw (CAudioError) :
+CPulseStreamSpec::CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo) throw(CAudioError) :
     __mLatency(latency),
     __mAudioInfo(audioInfo),
     __mStreamName(NULL) {
     __adjustSpec();
 }
 
-CPulseStreamSpec::CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo, int customLatency) throw (CAudioError) :
+CPulseStreamSpec::CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo, int customLatency) throw(CAudioError) :
     __mLatency(latency),
     __mAudioInfo(audioInfo),
     __mStreamName(NULL) {
@@ -61,7 +61,7 @@ CPulseStreamSpec::CPulseStreamSpec(EStreamLatency latency, CAudioInfo& audioInfo
 CPulseStreamSpec::~CPulseStreamSpec() {
 }
 
-void CPulseStreamSpec::__adjustSpec() throw (CAudioError) {
+void CPulseStreamSpec::__adjustSpec() throw(CAudioError) {
     // Sets a sampleRate
     __mSampleSpec.rate = __mAudioInfo.getSampleRate();
 

diff --git a/src/cpp/cpp_audio_io.cpp b/src/cpp/cpp_audio_io.cpp
index 97355f1..3442454 100644 (file)
--- a/src/cpp/cpp_audio_io.cpp
+++ b/src/cpp/cpp_audio_io.cpp
@@ -277,7 +277,7 @@ static audio_io_state_e __convert_state_type(const CAudioInfo::EAudioIOState src
     return dst_state;
 }
 
-static void __check_audio_param(int sample_rate, audio_channel_e channel, audio_sample_type_e type)  throw (CAudioError) {
+static void __check_audio_param(int sample_rate, audio_channel_e channel, audio_sample_type_e type) throw(CAudioError) {
     if (sample_rate < 0) {
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Invalid sample rate :%d", sample_rate);
     }
@@ -291,7 +291,7 @@ static void __check_audio_param(int sample_rate, audio_channel_e channel, audio_
     }
 }
 
-static void __check_audio_param(int sample_rate, audio_channel_e channel, audio_sample_type_e type, sound_type_e sound_type) throw (CAudioError) {
+static void __check_audio_param(int sample_rate, audio_channel_e channel, audio_sample_type_e type, sound_type_e sound_type) throw(CAudioError) {
     __check_audio_param(sample_rate, channel, type);
 
     if (sound_type < SOUND_TYPE_SYSTEM || sound_type > SOUND_TYPE_VOICE) {
@@ -299,7 +299,7 @@ static void __check_audio_param(int sample_rate, audio_channel_e channel, audio_
     }
 }
 
-static CAudioInfo __generate_audio_input_info(int sampleRate, audio_channel_e channel, audio_sample_type_e sample_type) throw (CAudioError) {
+static CAudioInfo __generate_audio_input_info(int sampleRate, audio_channel_e channel, audio_sample_type_e sample_type) throw(CAudioError) {
     CAudioInfo::EChannel     dstChannel;
     CAudioInfo::ESampleType dstSampleType;
     CAudioInfo::EAudioType  dstAudioType = CAudioInfo::EAudioType::AUDIO_IN_TYPE_MEDIA;
@@ -310,7 +310,7 @@ static CAudioInfo __generate_audio_input_info(int sampleRate, audio_channel_e ch
     return CAudioInfo(sampleRate, dstChannel, dstSampleType, dstAudioType, -1);
 }
 
-static CAudioInfo __generate_audio_input_loopback_info(int sampleRate, audio_channel_e channel, audio_sample_type_e sample_type) throw (CAudioError) {
+static CAudioInfo __generate_audio_input_loopback_info(int sampleRate, audio_channel_e channel, audio_sample_type_e sample_type) throw(CAudioError) {
     CAudioInfo::EChannel     dstChannel;
     CAudioInfo::ESampleType dstSampleType;
     CAudioInfo::EAudioType  dstAudioType = CAudioInfo::EAudioType::AUDIO_IN_TYPE_LOOPBACK;
@@ -321,7 +321,7 @@ static CAudioInfo __generate_audio_input_loopback_info(int sampleRate, audio_cha
     return CAudioInfo(sampleRate, dstChannel, dstSampleType, dstAudioType, -1);
 }
 
-static CAudioInfo __generate_audio_output_info(int sampleRate, audio_channel_e channel, audio_sample_type_e sample_type, sound_type_e sound_type) throw (CAudioError) {
+static CAudioInfo __generate_audio_output_info(int sampleRate, audio_channel_e channel, audio_sample_type_e sample_type, sound_type_e sound_type) throw(CAudioError) {
     CAudioInfo::EChannel     dstChannel;
     CAudioInfo::ESampleType dstSampleType;
     CAudioInfo::EAudioType  dstAudioType;
@@ -400,7 +400,6 @@ int cpp_audio_in_create(int sample_rate, audio_channel_e channel, audio_sample_t
     }
 
     return AUDIO_IO_ERROR_NONE;
-
 }
 
 int cpp_audio_in_create_loopback(int sample_rate, audio_channel_e channel, audio_sample_type_e type , audio_in_h* input) {
@@ -488,13 +487,13 @@ int cpp_audio_in_set_stream_info(audio_in_h input, sound_stream_info_h stream_in
         }
 
         if (avail) {
-            if ((errorCode = sound_manager_get_type_from_stream_information (stream_info, &type)) != SOUND_MANAGER_ERROR_NONE) {
+            if ((errorCode = sound_manager_get_type_from_stream_information(stream_info, &type)) != SOUND_MANAGER_ERROR_NONE) {
                 THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Parameter stream_info->stream_type is invalid [ret:%d]", errorCode);
             }
             handle->audioIoHandle->getAudioInfo().convertInputStreamType2AudioType(type, &audioType);
             handle->audioIoHandle->getAudioInfo().setAudioType(audioType);
 
-            if ((errorCode = sound_manager_get_index_from_stream_information (stream_info, &index)) != SOUND_MANAGER_ERROR_NONE) {
+            if ((errorCode = sound_manager_get_index_from_stream_information(stream_info, &index)) != SOUND_MANAGER_ERROR_NONE) {
                 THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Parameter stream_info->index is invalid [ret:%d]", errorCode);
             }
             handle->audioIoHandle->getAudioInfo().setAudioIndex(index);
@@ -1115,13 +1114,13 @@ int cpp_audio_out_set_stream_info(audio_out_h output, sound_stream_info_h stream
         }
 
         if (avail) {
-            if ((errorCode = sound_manager_get_type_from_stream_information (stream_info, &type)) != SOUND_MANAGER_ERROR_NONE) {
+            if ((errorCode = sound_manager_get_type_from_stream_information(stream_info, &type)) != SOUND_MANAGER_ERROR_NONE) {
                 THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Parameter stream_info->stream_type is invalid [ret:%d]", errorCode);
             }
             handle->audioIoHandle->getAudioInfo().convertOutputStreamType2AudioType(type, &audioType);
             handle->audioIoHandle->getAudioInfo().setAudioType(audioType);
 
-            if ((errorCode = sound_manager_get_index_from_stream_information (stream_info, &index)) != SOUND_MANAGER_ERROR_NONE) {
+            if ((errorCode = sound_manager_get_index_from_stream_information(stream_info, &index)) != SOUND_MANAGER_ERROR_NONE) {
                 THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Parameter stream_info->index is invalid [ret:%d]", errorCode);
             }
             handle->audioIoHandle->getAudioInfo().setAudioIndex(index);