Add SOUND_STREAM_FOCUS_FOR_BOTH enumerator

[Version] 0.3.73
[Profile] Common
[Issue Type] Feature enhancement

Change-Id: Id83cbc0dd281067ea3742768868934e293cd4894
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/include/sound_manager.h b/include/sound_manager.h
index 329645edcfa877f15032a7fa3a25545b63ce972b..b5898004ce313602a5d039b9335633def9465122 100644 (file)
--- a/include/sound_manager.h
+++ b/include/sound_manager.h
@@ -129,6 +129,7 @@ typedef enum {
 typedef enum {
        SOUND_STREAM_FOCUS_FOR_PLAYBACK    = 0x0001,   /**< Mask for playback focus */
        SOUND_STREAM_FOCUS_FOR_RECORDING   = 0x0002,   /**< Mask for recording focus */
+       SOUND_STREAM_FOCUS_FOR_BOTH        = 0x0003,   /**< Mask for both playback and recording focus */
 } sound_stream_focus_mask_e;
 
 /**

diff --git a/include/sound_manager_private.h b/include/sound_manager_private.h
index 3951f801047d4b73f63f936d533dcd0c47ce92ce..c494612f5a6af82252b324d0e8b6b264d45cebb5 100644 (file)
--- a/include/sound_manager_private.h
+++ b/include/sound_manager_private.h
@@ -158,7 +158,7 @@ typedef struct _sound_stream_info_s {
        pa_threaded_mainloop *pa_mainloop;
        pa_context *pa_context;
        stream_conf_info_s stream_conf_info;
-       sound_stream_focus_mask_e acquired_focus;
+       unsigned int acquired_focus;
        int requesting_flags;
        int requested_flags;
        sound_stream_focus_state_changed_cb user_cb;

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index 1635ec002a9bdff7d38309f51c1497cdcc6eac1a..ec24c420ecd93b6fffc45e314004bbafdc6a72ef 100755 (executable)
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.3.72
+Version:    0.3.73
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/test/sound_manager_test.c b/test/sound_manager_test.c
index 69b46f222950c651eb0a4b26f85ae366e37d803c..87def79a502c8749ecc2f573c6f6ec305eea3126 100644 (file)
--- a/test/sound_manager_test.c
+++ b/test/sound_manager_test.c
@@ -563,11 +563,10 @@ void _get_device_props_simple(sound_device_h device, int *id, char **type, char
        sound_device_state_e _state;
        int _avail_modes;
 
-       if ((ret = sound_manager_get_device_type(device, &_type))) {
+       if ((ret = sound_manager_get_device_type(device, &_type)))
                g_print("failed to get device type, ret[0x%x]\n",  ret);
-       } else {
+       else
                _convert_device_type(_type, type);
-       }
 
        if ((ret = sound_manager_get_device_id(device, id))) {
                g_print("failed to get device id, ret[0x%x]\n", ret);
@@ -1297,7 +1296,7 @@ static void interpret(char *cmd)
                        focus_mask = SOUND_STREAM_FOCUS_FOR_RECORDING;
                        break;
                case 2: /* all */
-                       focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING;
+                       focus_mask = SOUND_STREAM_FOCUS_FOR_BOTH;
                        break;
                default:
                        focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK;
@@ -1324,7 +1323,7 @@ static void interpret(char *cmd)
                        focus_mask = SOUND_STREAM_FOCUS_FOR_RECORDING;
                        break;
                case 2: /* both */
-                       focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING;
+                       focus_mask = SOUND_STREAM_FOCUS_FOR_BOTH;
                        break;
                default:
                        focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK;
@@ -1396,7 +1395,7 @@ static void interpret(char *cmd)
                        focus_mask = SOUND_STREAM_FOCUS_FOR_RECORDING;
                        break;
                case 2: /* both */
-                       focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK | SOUND_STREAM_FOCUS_FOR_RECORDING;
+                       focus_mask = SOUND_STREAM_FOCUS_FOR_BOTH;
                        break;
                default:
                        focus_mask = SOUND_STREAM_FOCUS_FOR_PLAYBACK;