Remove unused handle mode enum for pa_client

[Version] 0.12.46
[Issue Type] Refactorying

Change-Id: I208d23d0bb9318d3a7b21de49ca1ee7f6968550c

diff --git a/include/mm_sound_pa_client.h b/include/mm_sound_pa_client.h
index abe2f0f822c235647ccea2edfa8bd04687aebd4e..13409a5e3f6f5f36bff3585d68f8a7fcf0a5dc3e 100644 (file)
--- a/include/mm_sound_pa_client.h
+++ b/include/mm_sound_pa_client.h
@@ -30,16 +30,6 @@
 
 typedef enum {
        HANDLE_MODE_OUTPUT,                             /**< Output mode of handle */
-       HANDLE_MODE_OUTPUT_CLOCK,                       /**< Output mode of gst audio only mode */
-       HANDLE_MODE_OUTPUT_VIDEO,                       /**< Output mode of gst video mode */
-       HANDLE_MODE_OUTPUT_LOW_LATENCY, /**< Output mode for low latency play mode. typically for game */
-       HANDLE_MODE_INPUT,                                      /**< Input mode of handle */
-       HANDLE_MODE_INPUT_HIGH_LATENCY, /**< Input mode for high latency capture mode. */
-       HANDLE_MODE_INPUT_LOW_LATENCY,          /**< Input mode for low latency capture mode. typically for VoIP */
-       HANDLE_MODE_CALL_OUT,                           /**< for voice call establish */
-       HANDLE_MODE_CALL_IN,                            /**< for voice call establish */
-       HANDLE_MODE_OUTPUT_AP_CALL,             /**< for VT call on thin modem */
-       HANDLE_MODE_INPUT_AP_CALL,                      /**< for VT call on thin modem */
        HANDLE_MODE_NUM,                                        /**< Number of mode */
 } MMSoundHandleMode;
 

diff --git a/mm_sound_pa_client.c b/mm_sound_pa_client.c
index c0607616c01f59398272ae488e4fa606fdc49095..4add2badbdeae1db287dd5c02020523cf9e6a984 100644 (file)
--- a/mm_sound_pa_client.c
+++ b/mm_sound_pa_client.c
@@ -155,7 +155,6 @@ int mm_sound_pa_open(MMSoundHandleMode mode, int volume_config, pa_sample_spec *
        int err = MM_ERROR_SOUND_INTERNAL;
        int period_time = PA_SIMPLE_PERIOD_TIME_FOR_MID_LATENCY_MSEC;
        int samples_per_period = PA_SIMPLE_SAMPLES_PER_PERIOD_DEFAULT;
-       int periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_DEFAULT;
 
        int handle_mode = mode;
        int sample_size = 0;
@@ -200,52 +199,9 @@ int mm_sound_pa_open(MMSoundHandleMode mode, int volume_config, pa_sample_spec *
        memset(&attr, '\0', sizeof(attr));
 
        switch (handle_mode) {
-       case HANDLE_MODE_INPUT:
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_MID_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_DEFAULT;
-               attr.prebuf = 0;
-               attr.minreq = -1;
-               attr.tlength = -1;
-               attr.maxlength = -1;
-               attr.fragsize = samples_per_period * pa_sample_size(ss);
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_RECORD, NULL, "CAPTURE", ss, channel_map, &attr,
-                                                                  proplist, &err);
-               break;
-
-       case HANDLE_MODE_INPUT_LOW_LATENCY:
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_ULOW_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_FASTMODE;
-               attr.prebuf = 0;
-               attr.minreq = -1;
-               attr.tlength = -1;
-               attr.maxlength = -1;
-               attr.fragsize = samples_per_period * pa_sample_size(ss);
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_RECORD, NULL, "LOW LATENCY CAPTURE", ss, channel_map,
-                                                                  &attr, proplist, &err);
-               break;
-
-       case HANDLE_MODE_INPUT_HIGH_LATENCY:
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_HIGH_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_CAPTURE;
-               attr.prebuf = 0;
-               attr.minreq = -1;
-               attr.tlength = -1;
-               attr.maxlength = -1;
-               attr.fragsize = samples_per_period * pa_sample_size(ss);
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_RECORD, NULL, "HIGH LATENCY CAPTURE", ss, channel_map,
-                                                                  &attr, proplist, &err);
-               break;
-
        case HANDLE_MODE_OUTPUT:
                period_time = PA_SIMPLE_PERIOD_TIME_FOR_MID_LATENCY_MSEC;
                samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_DEFAULT;
                attr.prebuf = -1;
                attr.minreq = -1;
                attr.tlength = (ss->rate / 10) * pa_sample_size(ss) * ss->channels;
@@ -256,88 +212,6 @@ int mm_sound_pa_open(MMSoundHandleMode mode, int volume_config, pa_sample_spec *
                                                                   proplist, &err);
                break;
 
-       case HANDLE_MODE_OUTPUT_LOW_LATENCY:
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_LOW_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_FASTMODE;
-               attr.prebuf = (ss->rate / 100) * pa_sample_size(ss) * ss->channels;
-               attr.minreq = -1;
-               attr.tlength = (ss->rate / 10) * pa_sample_size(ss) * ss->channels;
-               attr.maxlength = -1;
-               attr.fragsize = 0;
-               debug_msg("rate(%d), samplesize(%zu), ch(%d) format(%d)", ss->rate, pa_sample_size(ss), ss->channels, ss->format);
-
-               debug_msg("prebuf(%d), minreq(%d), tlength(%d), maxlength(%d), fragsize(%d)", attr.prebuf, attr.minreq, attr.tlength,
-                                 attr.maxlength, attr.fragsize);
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_PLAYBACK, NULL, "LOW LATENCY PLAYBACK", ss,
-                                                                  channel_map, &attr, proplist, &err);
-               break;
-
-       case HANDLE_MODE_OUTPUT_CLOCK:
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_HIGH_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_PLAYBACK;
-               attr.prebuf = -1;
-               attr.minreq = -1;
-               attr.tlength = (uint32_t) - 1;
-               attr.maxlength = -1;
-               attr.fragsize = 0;
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_PLAYBACK, NULL, "HIGH LATENCY PLAYBACK", ss,
-                                                                  channel_map, &attr, proplist, &err);
-               break;
-
-       case HANDLE_MODE_OUTPUT_VIDEO:  /* low latency playback */
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_LOW_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_VIDEO;
-               attr.prebuf = 4 * (samples_per_period * pa_sample_size(ss));
-               attr.minreq = samples_per_period * pa_sample_size(ss);
-               attr.tlength = periods_per_buffer * samples_per_period * pa_sample_size(ss);
-               attr.maxlength = -1;
-               attr.fragsize = 0;
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_PLAYBACK, NULL, "LOW LATENCY PLAYBACK", ss,
-                                                                  channel_map, &attr, proplist, &err);
-               break;
-
-       case HANDLE_MODE_OUTPUT_AP_CALL:
-#if defined(_MMFW_I386_ALL_SIMULATOR)
-               debug_msg("Does not support AP call mode at i386 simulator");
-               s = NULL;
-#else
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_VOIP_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_VOIP;
-               attr.prebuf = -1;
-               attr.minreq = pa_usec_to_bytes(20 * PA_USEC_PER_MSEC, ss);
-               attr.tlength = pa_usec_to_bytes(100 * PA_USEC_PER_MSEC, ss);
-               attr.maxlength = -1;
-               attr.fragsize = 0;
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_PLAYBACK, NULL, "VoIP PLAYBACK", ss, channel_map,
-                                                                  &attr, proplist, &err);
-#endif
-               break;
-       case HANDLE_MODE_INPUT_AP_CALL:
-#if defined(_MMFW_I386_ALL_SIMULATOR)
-               debug_msg("Does not support AP call mode at i386 simulator");
-               s = NULL;
-#else
-               period_time = PA_SIMPLE_PERIOD_TIME_FOR_VOIP_LATENCY_MSEC;
-               samples_per_period = (ss->rate * period_time) / 1000;
-               periods_per_buffer = PA_SIMPLE_PERIODS_PER_BUFFER_VOIP;
-               attr.prebuf = 0;
-               attr.minreq = -1;
-               attr.tlength = -1;
-               attr.maxlength = -1;
-               attr.fragsize = samples_per_period * pa_sample_size(ss);
-
-               s = pa_simple_new_proplist(NULL, "MM_SOUND_PA_CLIENT", PA_STREAM_RECORD, NULL, "VoIP CAPTURE", ss, channel_map, &attr,
-                                                                  proplist, &err);
-#endif
-               break;
        default:
                err = MM_ERROR_SOUND_INTERNAL;
                goto fail;
@@ -443,10 +317,6 @@ int mm_sound_pa_close(const int handle)
 
        switch (phandle->mode) {
        case HANDLE_MODE_OUTPUT:
-       case HANDLE_MODE_OUTPUT_CLOCK:
-       case HANDLE_MODE_OUTPUT_LOW_LATENCY:
-       case HANDLE_MODE_OUTPUT_AP_CALL:
-       case HANDLE_MODE_OUTPUT_VIDEO:
                if (0 > pa_simple_flush(phandle->s, &err)) {
                        err = MM_ERROR_SOUND_INTERNAL;
                        debug_msg("pa_simple_flush() failed with %s", pa_strerror(err));

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 745d37015f1380e3fbff009f2e33205d62061e80..413ddabb61f5abdc2d9be367ab039eea4891af5a 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.12.45
+Version:    0.12.46
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0