Expand the prestate of radio_scan_start functionsubmit/tizen/20160907.074000accepted/tizen/wearable/20160908.044025accepted/tizen/mobile/20160908.043107accepted/tizen/ivi/20160908.044135accepted/tizen/common/20160907.154630

[Version] 0.2.6
[Profile] Common
[Issue Type] Tizen Mobile Platform Requirement

Change-Id: Ic20925b0479dde601918c4f2e24f1c4716c73c32

4 files changed, 22 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index f2066a6..c9ea877 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS='-I m4' 
 
-SUBDIRS = src test
+SUBDIRS = src
 
 pcfiles = mm-radio.pc
 
diff --git a/packaging/libmm-radio.spec b/packaging/libmm-radio.spec
index cc4200b..29f8a6e 100755
--- a/packaging/libmm-radio.spec
+++ b/packaging/libmm-radio.spec
@@ -1,6 +1,6 @@
 Name:       libmm-radio
 Summary:    Multimedia Framework Radio Library
-Version:    0.2.5
+Version:    0.2.6
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -27,14 +27,6 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 Description: Multimedia Framework Radio Library (DEV)
 
-%package test
-Summary:    Multimedia Framework Radio Library (TEST)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description test
-Description: Multimedia Framework Radio Library (TEST)
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
@@ -80,7 +72,3 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
 %{_libdir}/pkgconfig/mm-radio.pc
 %{_includedir}/mmf/mm_radio.h
 
-%files test
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_bindir}/mm_radio_testsuite
diff --git a/src/mm_radio_priv.c b/src/mm_radio_priv.c
index 17a30a3..6098578 100755
--- a/src/mm_radio_priv.c
+++ b/src/mm_radio_priv.c
@@ -988,7 +988,14 @@ void __mmradio_scan_thread(mm_radio_t *radio)
  FINISHED:
 	radio->scan_thread = 0;
 
-	MMRADIO_SET_STATE(radio, MM_RADIO_STATE_READY);
+	if (radio->old_state == MM_RADIO_STATE_READY) {
+		MMRADIO_SET_STATE(radio, MM_RADIO_STATE_READY);
+	} else if (radio->old_state == MM_RADIO_STATE_PLAYING) {
+		MMRADIO_LOG_DEBUG("old state is playing");
+		ret = _mmradio_unmute(radio);
+		ret = _mmradio_set_frequency(radio->hal_inf, prev_freq);
+		MMRADIO_SET_STATE(radio, MM_RADIO_STATE_PLAYING);
+	}
 
 	if (!radio->stop_scan)
 		MMRADIO_POST_MSG(radio, MM_MESSAGE_RADIO_SCAN_FINISH, NULL);
@@ -1203,7 +1210,7 @@ static int __mmradio_check_state(mm_radio_t *radio, MMRadioCommand command)
 			if (radio_state == MM_RADIO_STATE_SCANNING)
 				goto NO_OP;
 
-			if (radio_state != MM_RADIO_STATE_READY)
+			if (radio_state == MM_RADIO_STATE_NULL)
 				goto INVALID_STATE;
 		}
 		break;
diff --git a/src/mm_radio_priv_emulator.c b/src/mm_radio_priv_emulator.c
index 75a70bd..845aba3 100644
--- a/src/mm_radio_priv_emulator.c
+++ b/src/mm_radio_priv_emulator.c
@@ -875,6 +875,10 @@ void __mmradio_scan_thread(mm_radio_t * radio)
 	if (_mmradio_set_frequency(radio, radio->region_setting.band_min) != MM_ERROR_NONE)
 		goto FINISHED;
 
+	if (radio->old_state == MM_RADIO_STATE_PLAYING) {
+		_mmradio_mute(radio);
+	}
+
 	MMRADIO_POST_MSG(radio, MM_MESSAGE_RADIO_SCAN_START, NULL);
 	MMRADIO_SET_STATE(radio, MM_RADIO_STATE_SCANNING);
 
@@ -922,7 +926,12 @@ void __mmradio_scan_thread(mm_radio_t * radio)
  FINISHED:
 	radio->scan_thread = 0;
 
-	MMRADIO_SET_STATE(radio, MM_RADIO_STATE_READY);
+	if (radio->old_state == MM_RADIO_STATE_READY) {
+		MMRADIO_SET_STATE(radio, MM_RADIO_STATE_READY);
+	} else if (radio->old_state == MM_RADIO_STATE_PLAYING) {
+		_mmradio_unmute(radio);
+		MMRADIO_SET_STATE(radio, MM_RADIO_STATE_PLAYING);
+	}
 
 	if (!radio->stop_scan)
 		MMRADIO_POST_MSG(radio, MM_MESSAGE_RADIO_SCAN_FINISH, NULL);
@@ -1138,7 +1147,7 @@ static int __mmradio_check_state(mm_radio_t * radio, MMRadioCommand command)
 			if (radio_state == MM_RADIO_STATE_SCANNING)
 				goto NO_OP;
 
-			if (radio_state != MM_RADIO_STATE_READY)
+			if (radio_state == MM_RADIO_STATE_NULL)
 				goto INVALID_STATE;
 		}
 		break;