Remove build warning

[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_sound.c

diff --git a/src/mm_camcorder_sound.c b/src/mm_camcorder_sound.c
index 44e9dae..961670c 100644 (file)
--- a/src/mm_camcorder_sound.c
+++ b/src/mm_camcorder_sound.c
@@ -102,8 +102,8 @@ gboolean _mmcamcorder_sound_play(MMHandleType handle, const char *sample_name, g
 
        /* check sound play enable */
        mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
-                                   "capture-sound-enable", &sound_enable,
-                                   NULL);
+               "capture-sound-enable", &sound_enable,
+               NULL);
        _mmcam_dbg_log("Capture sound enable %d", sound_enable);
        if (!sound_enable) {
                _mmcam_dbg_warn("capture sound disabled");
@@ -120,11 +120,10 @@ gboolean _mmcamcorder_sound_play(MMHandleType handle, const char *sample_name, g
                return FALSE;
        }
 
-       if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE02)) {
+       if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE02))
                volume_gain = "shutter2";
-       } else if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_REC_STOP)) {
+       else if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_REC_STOP))
                volume_gain = "camcording";
-       }
 
        _mmcam_dbg_log("Play start - sample name [%s]", sample_name);
 
@@ -171,6 +170,7 @@ gboolean _mmcamcorder_sound_finalize(MMHandleType handle)
 int _mmcamcorder_sound_solo_play(MMHandleType handle, const char *sample_name, gboolean sync_play)
 {
        int sound_enable = TRUE;
+       int current_state = MM_CAMCORDER_STATE_NONE;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -180,10 +180,16 @@ int _mmcamcorder_sound_solo_play(MMHandleType handle, const char *sample_name, g
 
        _mmcamcorder_sound_solo_play_wait(handle);
 
+       current_state = _mmcamcorder_get_state(handle);
+       if (current_state < MM_CAMCORDER_STATE_PREPARE) {
+               _mmcam_dbg_warn("invalid state %d", current_state);
+               return FALSE;
+       }
+
        /* check sound play enable */
        mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL,
-                                   "capture-sound-enable", &sound_enable,
-                                   NULL);
+               "capture-sound-enable", &sound_enable,
+               NULL);
        _mmcam_dbg_log("Capture sound enable %d", sound_enable);
        if (!sound_enable) {
                _mmcam_dbg_warn("capture sound disabled");
@@ -223,7 +229,7 @@ void _mmcamcorder_sound_solo_play_wait(MMHandleType handle)
 
                _mmcam_dbg_log("Wait for signal");
 
-               end_time = g_get_monotonic_time() + (2 * G_TIME_SPAN_SECOND);
+               end_time = g_get_monotonic_time() + G_TIME_SPAN_SECOND;
 
                if (g_cond_wait_until(&hcamcorder->gdbus_info_solo_sound.sync_cond,
                        &hcamcorder->gdbus_info_solo_sound.sync_mutex, end_time)) {