[ITC][audio-io][Non-ACR] Fix build errors / warnings

Change-Id: I5b01305700f789d5abd3f49f2f194eb6a0f5169d

diff --git a/src/itc/audio-io/ITs-audio-input-common.c b/src/itc/audio-io/ITs-audio-input-common.c
index 171c5f492cfaa9839be52cc12697d9d4a963bc9e..57c55dab2f84ec8af6805a1a21f1939003a240d7 100755 (executable)
--- a/src/itc/audio-io/ITs-audio-input-common.c
+++ b/src/itc/audio-io/ITs-audio-input-common.c
@@ -43,44 +43,51 @@ char* AudioInputGetError(int nRet)
        case AUDIO_IO_ERROR_DEVICE_POLICY_RESTRICTION :         szErrorVal = "AUDIO_IO_ERROR_DEVICE_POLICY_RESTRICTION ";       break;
        case AUDIO_IO_ERROR_PERMISSION_DENIED:                          szErrorVal = "AUDIO_IO_ERROR_PERMISSION_DENIED ";                       break;
        case AUDIO_IO_ERROR_NOT_SUPPORTED :                                     szErrorVal = "AUDIO_IO_ERROR_NOT_SUPPORTED ";                           break;
-       case AUDIO_IO_ERROR_INVALID_STATE :                                     szErrorVal = "AUDIO_IO_ERROR_INVALID_STATE ";                           break;  
+       case AUDIO_IO_ERROR_INVALID_STATE :                                     szErrorVal = "AUDIO_IO_ERROR_INVALID_STATE ";                           break;
        default:                                                                                        szErrorVal = "Unknown Error";                                                           break;
-               
        }
        return szErrorVal;
 }
 
 /**
 * @function            AudioChannel
-* @description         Maps error enums 
+* @description         Maps error enums
 * @parameter           nRet: error code returned
 * @return                      error string
 */
 char* AudioChannel(audio_channel_e nRet)
 {
-       char *szErrorVal = "Unknown Error";
+       char *szErrorVal = NULL;
        switch ( nRet )
        {
        case AUDIO_CHANNEL_STEREO:              szErrorVal = "AUDIO_CHANNEL_STEREO";    break;
        case AUDIO_CHANNEL_MONO:                szErrorVal = "AUDIO_CHANNEL_MONO";              break;
+       case AUDIO_CHANNEL_MULTI_4:             szErrorVal = "AUDIO_CHANNEL_MULTI_4";   break;
+       case AUDIO_CHANNEL_MULTI_5:             szErrorVal = "AUDIO_CHANNEL_MULTI_5";   break;
+       case AUDIO_CHANNEL_MULTI_6:             szErrorVal = "AUDIO_CHANNEL_MULTI_6";   break;
+       case AUDIO_CHANNEL_MULTI_7:             szErrorVal = "AUDIO_CHANNEL_MULTI_7";   break;
+       case AUDIO_CHANNEL_MULTI_8:             szErrorVal = "AUDIO_CHANNEL_MULTI_8";   break;
+       default:                                                szErrorVal = "Unknown Error";                   break;
        }
        return szErrorVal;
 }
 /**
 * @function            AudioSampleRate
-* @description         Maps error enums 
+* @description         Maps error enums
 * @parameter           nRet: error code returned
 * @return                      error string
 */
 char* AudioSampleRate(audio_sample_type_e nRet)
 {
-       char *szErrorVal = "Unknown Error";
+       char *szErrorVal = NULL;
        switch ( nRet )
        {
        case AUDIO_SAMPLE_TYPE_U8:                      szErrorVal = "AUDIO_SAMPLE_TYPE_U8";            break;
-       case AUDIO_SAMPLE_TYPE_S16_LE:                  szErrorVal = "AUDIO_SAMPLE_TYPE_S16_LE";        break;
-       case AUDIO_SAMPLE_TYPE_S24_LE:                  szErrorVal = "AUDIO_SAMPLE_TYPE_S24_LE";        break;
-       case AUDIO_SAMPLE_TYPE_S24_32_LE:               szErrorVal = "AUDIO_SAMPLE_TYPE_S24_32_LE";      break;
+       case AUDIO_SAMPLE_TYPE_S16_LE:          szErrorVal = "AUDIO_SAMPLE_TYPE_S16_LE";        break;
+       case AUDIO_SAMPLE_TYPE_S24_LE:          szErrorVal = "AUDIO_SAMPLE_TYPE_S24_LE";        break;
+       case AUDIO_SAMPLE_TYPE_S24_32_LE:       szErrorVal = "AUDIO_SAMPLE_TYPE_S24_32_LE";     break;
+       case AUDIO_SAMPLE_TYPE_S32_LE:          szErrorVal = "AUDIO_SAMPLE_TYPE_S32_LE";        break;
+       default:                                                        szErrorVal = "Unknown Error";                           break;
        }
        return szErrorVal;
 }
@@ -112,4 +119,4 @@ char* SoundManagerGetError(int nRet)
        return szErrorVal;
 }
 /** @} */
-//Add helper function definitions here
\ No newline at end of file
+//Add helper function definitions here

diff --git a/src/itc/audio-io/ITs-audio-input.c b/src/itc/audio-io/ITs-audio-input.c
index 27b85a6942e71be868e1e98a7909d81737181913..dc2a0df4ef310fa4a0284b8d76274b8358f795c1 100755 (executable)
--- a/src/itc/audio-io/ITs-audio-input.c
+++ b/src/itc/audio-io/ITs-audio-input.c
@@ -26,7 +26,6 @@ static bool g_bAudioIoStreamCallback = false;
 int g_nPeekFailCount = 0;
 int g_nDropFailCount = 0;
 static GMainLoop *g_pMainLoop;
-static bool g_bAudioIoInterruptedCbCallback = false;
 
 gboolean Timeout_Function(gpointer data)
 {
@@ -39,7 +38,7 @@ gboolean Timeout_Function(gpointer data)
 * @description         Called before each test, creates Audio handle
 * @parameter           NA
 * @return                      NA
-*/ 
+*/
 void ITs_audio_input_startup(void)
 {
        struct stat stBuff;
@@ -777,7 +776,7 @@ int ITc_audio_in_set_get_volume_p(void)
         PRINT_RESULT_CLEANUP(AUDIO_IO_ERROR_NONE, nRet, "audio_in_get_volume", AudioInputGetError(nRet), audio_in_destroy(hInputHandle));
 
         if(nGetVolume!=nSetVolume[i]){
-            FPRINTF("[Line : %d][%s] Incorrect value of volume returned, Volume set:%d, Volume got:%d\\n", __LINE__, API_NAMESPACE, nSetVolume[i], nGetVolume);
+            FPRINTF("[Line : %d][%s] Incorrect value of volume returned, Volume set:%f, Volume got:%f\\n", __LINE__, API_NAMESPACE, nSetVolume[i], nGetVolume);
             audio_in_destroy(hInputHandle);
             return 1;
         }

diff --git a/src/itc/audio-io/ITs-audio-input_create_destroy.c b/src/itc/audio-io/ITs-audio-input_create_destroy.c
index c35827d8323ed7e9ecbd21446ffee5348f5bc722..96144db32b2ab5200f1a36e782e3655d342ceb99 100755 (executable)
--- a/src/itc/audio-io/ITs-audio-input_create_destroy.c
+++ b/src/itc/audio-io/ITs-audio-input_create_destroy.c
@@ -82,11 +82,11 @@ void ITs_audio_input1_cleanup(void)
 * @author                              SRID(sk.roy)
 * @reviewer                            SRID(gupta.sanjay)
 * @type                                auto
-* @description                 To create an audio device instance and to return an input handle to record PCM and to release it 
+* @description                 To create an audio device instance and to return an input handle to record PCM and to release it
 * @scenario                            Create an audio device\n
 *                                              Create a local audio handle\n
 *                                              Destroy the audio handle
-* @apicovered                  audio_in_create, audio_in_destroy                                               
+* @apicovered                  audio_in_create, audio_in_destroy
 * @passcase                            When audio_in_create and audio_in_destroy are successful.
 * @failcase                            If target API audio_in_create fails or any precondition API fails.
 * @precondition                        Audio handle must be created
@@ -127,18 +127,18 @@ int ITc_audio_in_create_destroy_p(void)
                                FPRINTF("[Line : %d][%s] audio_in_create returns NOT SUPPORTED correctly", __LINE__, API_NAMESPACE);
                                continue;
                        }
-                       FPRINTF("[Line : %d][%s] audio_in_create failed for eAudioChannel = %s and eAudioSampleRate = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioInputGetError(nRet));
+                       FPRINTF("[Line : %d][%s] audio_in_create failed for eAudioChannel = %u and eAudioSampleRate = %d, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioInputGetError(nRet));
                        return 1;
                }
                if(pstAudioInputHandle == NULL)
                {
-                       FPRINTF("[Line : %d][%s] audio_in_create failed for eAudioChannel = %s and eAudioSampleRate = %s, pstAudioInputHandle is NULL\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate);
+                       FPRINTF("[Line : %d][%s] audio_in_create failed for eAudioChannel = %u and eAudioSampleRate = %d, pstAudioInputHandle is NULL\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate);
                        return 1;
                }
                nRet = audio_in_destroy(pstAudioInputHandle);
                if ( nRet != AUDIO_IO_ERROR_NONE )
                {
-                       FPRINTF("[Line : %d][%s] audio_in_destroy failed for eAudioChannel = %s and eAudioSampleRate = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioInputGetError(nRet));
+                       FPRINTF("[Line : %d][%s] audio_in_destroy failed for eAudioChannel = %u and eAudioSampleRate = %d, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioInputGetError(nRet));
                        return 1;
 }
        }

diff --git a/src/itc/audio-io/ITs-audio-output-common.c b/src/itc/audio-io/ITs-audio-output-common.c
index 944d8d23cd949ca6a5fa4261afe98cd39fbe866e..60999177f028b58447770996f8f4779324fc65a0 100755 (executable)
--- a/src/itc/audio-io/ITs-audio-output-common.c
+++ b/src/itc/audio-io/ITs-audio-output-common.c
@@ -48,39 +48,50 @@ char* AudioOutputGetError(int nRet)
 
 /**
 * @function            AudioChannel
-* @description         Maps error enums 
+* @description         Maps error enums
 * @parameter           nRet: error code returned
 * @return                      error string
 */
 char* AudioOutputChannel(audio_channel_e nRet)
 {
-       char *szErrorVal = "Unknown Error";
+       char *szErrorVal = NULL;
        switch ( nRet )
        {
        case AUDIO_CHANNEL_STEREO:              szErrorVal = "AUDIO_CHANNEL_STEREO";    break;
        case AUDIO_CHANNEL_MONO:                szErrorVal = "AUDIO_CHANNEL_MONO";              break;
+       case AUDIO_CHANNEL_MULTI_4:             szErrorVal = "AUDIO_CHANNEL_MULTI_4";   break;
+       case AUDIO_CHANNEL_MULTI_5:             szErrorVal = "AUDIO_CHANNEL_MULTI_5";   break;
+       case AUDIO_CHANNEL_MULTI_6:             szErrorVal = "AUDIO_CHANNEL_MULTI_6";   break;
+       case AUDIO_CHANNEL_MULTI_7:             szErrorVal = "AUDIO_CHANNEL_MULTI_7";   break;
+       case AUDIO_CHANNEL_MULTI_8:             szErrorVal = "AUDIO_CHANNEL_MULTI_8";   break;
+       default:                                                szErrorVal = "Unknown Error";                   break;
+
        }
        return szErrorVal;
 }
 /**
 * @function            AudioSampleRate
-* @description         Maps error enums 
+* @description         Maps error enums
 * @parameter           nRet: error code returned
 * @return                      error string
 */
 char* AudioOutputSampleRate(audio_sample_type_e nRet)
 {
-       char *szErrorVal = "Unknown Error";
+       char *szErrorVal = NULL;
        switch ( nRet )
        {
        case AUDIO_SAMPLE_TYPE_U8:                      szErrorVal = "AUDIO_SAMPLE_TYPE_U8";            break;
        case AUDIO_SAMPLE_TYPE_S16_LE:          szErrorVal = "AUDIO_SAMPLE_TYPE_S16_LE";        break;
+       case AUDIO_SAMPLE_TYPE_S24_LE:          szErrorVal = "AUDIO_SAMPLE_TYPE_S24_LE";        break;
+       case AUDIO_SAMPLE_TYPE_S24_32_LE:       szErrorVal = "AUDIO_SAMPLE_TYPE_S24_32_LE";     break;
+       case AUDIO_SAMPLE_TYPE_S32_LE:          szErrorVal = "AUDIO_SAMPLE_TYPE_S32_LE";        break;
+       default:                                                        szErrorVal = "Unknown Error";                           break;
        }
        return szErrorVal;
 }
 /**
 * @function            SoundType
-* @description         Maps error enums 
+* @description         Maps error enums
 * @parameter           nRet: error code returned
 * @return                      error string
 */
@@ -93,7 +104,7 @@ char* SoundType(sound_type_e nRet)
        case SOUND_TYPE_NOTIFICATION:           szErrorVal = "SOUND_TYPE_NOTIFICATION"; break;
        case SOUND_TYPE_MEDIA:                          szErrorVal = "SOUND_TYPE_MEDIA";                        break;
        case SOUND_TYPE_ALARM:                          szErrorVal = "SOUND_TYPE_ALARM";                        break;
-       case SOUND_TYPE_VOICE:                          szErrorVal = "SOUND_TYPE_VOICE";                        break;          
+       case SOUND_TYPE_VOICE:                          szErrorVal = "SOUND_TYPE_VOICE";                        break;
        default:                                                        szErrorVal = "Unknown Error";                           break;
        }
        return szErrorVal;
@@ -125,4 +136,4 @@ char* SoundManagerGetOutputError(int nRet)
        }
        return szErrorVal;
 }
-/** @} */
\ No newline at end of file
+/** @} */

diff --git a/src/itc/audio-io/ITs-audio-output_create_destroy.c b/src/itc/audio-io/ITs-audio-output_create_destroy.c
index 43d07bc5b182cd5f94199763222116bc4f68f46a..c41b28b41a4fec134a0288174c7232602ef25ffc 100755 (executable)
--- a/src/itc/audio-io/ITs-audio-output_create_destroy.c
+++ b/src/itc/audio-io/ITs-audio-output_create_destroy.c
@@ -74,7 +74,7 @@ void ITs_audio_output1_cleanup(void)
 *  @{
 */
 //& purpose:To create an audio device instance and to return an output handle to record PCM and to release it
-//& type: auto 
+//& type: auto
 /**
 * @testcase                    ITc_audio_out_create_new_destroy_p
 * @since_tizen                 3.0
@@ -116,19 +116,19 @@ int ITc_audio_out_create_new_destroy_p(void)
                int nRet = audio_out_create_new(audioCond[enum_counter].sampleRate, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleType, &pstAudioOutputHandle);
                if ( nRet != AUDIO_IO_ERROR_NONE )
                {
-                       FPRINTF("[Line : %d][%s] audio_out_create_new failed for eAudioChannel = %s, eAudioSampleRate = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioOutputGetError(nRet));
+                       FPRINTF("[Line : %d][%s] audio_out_create_new failed for eAudioChannel = %u, eAudioSampleRate = %d, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioOutputGetError(nRet));
                        return 1;
                }
                if(pstAudioOutputHandle == NULL)
                {
-                       FPRINTF("[Line : %d][%s] audio_out_create_new failed for eAudioChannel = %s, eAudioSampleRate = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioOutputGetError(nRet));
+                       FPRINTF("[Line : %d][%s] audio_out_create_new failed for eAudioChannel = %u, eAudioSampleRate = %d, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioOutputGetError(nRet));
                        return 1;
                }
 
                nRet = audio_out_destroy(pstAudioOutputHandle);
                if ( nRet != AUDIO_IO_ERROR_NONE )
                {
-                       FPRINTF("[Line : %d][%s] audio_out_destroy failed for eAudioChannel = %s, eAudioSampleRate = %s, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioOutputGetError(nRet));
+                       FPRINTF("[Line : %d][%s] audio_out_destroy failed for eAudioChannel = %u, eAudioSampleRate = %d, error returned = %s\\n", __LINE__, API_NAMESPACE, audioCond[enum_counter].channelType, audioCond[enum_counter].sampleRate, AudioOutputGetError(nRet));
                        return 1;
                }
        }