Merge tizen_2.1 into tizen_2.2

Change-Id: I85e5cbd96bb8d9f651a05c2c6dbae0ecd01a3c20
Signed-off-by: EonseokLee <eonseok.lee@samsung.com>

diff --git a/inc/FMediaAudioRouteManager.h b/inc/FMediaAudioRouteManager.h
index 113b4b9..05fe09a 100755 (executable)
--- a/inc/FMediaAudioRouteManager.h
+++ b/inc/FMediaAudioRouteManager.h
@@ -94,11 +94,11 @@ namespace Tizen { namespace Media
  *         return r;
  *     }
  *
- *                __pAudioRouteManager = AudioRouteManager::GetInstance();
- *              if (!__pAudioRouteManager)
- *        {
- *                             return E_OUT_OF_MEMORY;
- *             }
+ *     __pAudioRouteManager = AudioRouteManager::GetInstance();
+ *     if (!__pAudioRouteManager)
+ *     {
+ *         return E_OUT_OF_MEMORY;
+ *     }
  *
  *     r = __player.OpenFile(filePath, false);
  *     if (IsFailed(r))
@@ -112,33 +112,33 @@ namespace Tizen { namespace Media
  * result
  * RouteManagerSample::Play(void)
  * {
-  * result r = E_SUCCESS;
-  * r = __player.Play();
-  * return r;
+ *     result r = E_SUCCESS;
+ *     r = __player.Play();
+ *     return r;
  * }
  *
  * result
  * RouteManagerSample::Route(void)
  * {
- *       result r = E_SUCCESS;
- *   IList *pAudioDeviceList = null;
- *   int count;
+ *     result r = E_SUCCESS;
+ *     IList *pAudioDeviceList = null;
+ *     int count;
  *
  *     pAudioDeviceList = __pAudioRouteManager->GetAvailableAudioRouteListN();
  *     count = pAudioDeviceList->GetCount();
  *     if (count)
  *     {
- *     AudioRouteInfo *audioDevice = (AudioRouteInfo *) pAudioDeviceList->GetAt(0);
- *     r = __pAudioRouteManager->SetActiveAudioRoute(*audioDevice);
- *      if (IsFailed(r))
- *                     {
- *             return r;
- *                     }
- *             }
- *             pAudioDeviceList->RemoveAll();
- *             pAudioDeviceList = null;
+ *         AudioRouteInfo *audioDevice = (AudioRouteInfo *) pAudioDeviceList->GetAt(0);
+ *         r = __pAudioRouteManager->SetActiveAudioRoute(*audioDevice);
+ *         if (IsFailed(r))
+ *         {
+ *             return r;
+ *         }
+ *     }
+ *     pAudioDeviceList->RemoveAll();
+ *     pAudioDeviceList = null;
  *
- *       return r;
+ *     return r;
  * }
  *
  *

diff --git a/src/FMedia_AudioRecorderImpl.cpp b/src/FMedia_AudioRecorderImpl.cpp
index d23c79b..e4661b1 100755 (executable)
--- a/src/FMedia_AudioRecorderImpl.cpp
+++ b/src/FMedia_AudioRecorderImpl.cpp
@@ -333,7 +333,7 @@ _AudioRecorderImpl::Close(void)
 
        state = GetState();
        SysTryReturn(
-               NID_MEDIA, state == RECORDER_STATE_OPENED || state == RECORDER_STATE_STOPPED
+               NID_MEDIA, state == RECORDER_STATE_OPENED || state == RECORDER_STATE_STOPPED || state == RECORDER_STATE_STOPPING
                || state == RECORDER_STATE_ENDOF_FILE || state == RECORDER_STATE_ERROR
                           , E_INVALID_STATE, E_INVALID_STATE, "[E_INVALID_STATE] AudioRecorder is in an invalid state. AudioRecorder state is %d.",
                state);

diff --git a/src/FMedia_VideoRecorderImpl.cpp b/src/FMedia_VideoRecorderImpl.cpp
index 7ee0a5a..3856937 100755 (executable)
--- a/src/FMedia_VideoRecorderImpl.cpp
+++ b/src/FMedia_VideoRecorderImpl.cpp
@@ -399,7 +399,7 @@ _VideoRecorderImpl::Close(void)
 
        state = GetState();
        SysTryReturn(
-               NID_MEDIA, state == RECORDER_STATE_OPENED || state == RECORDER_STATE_STOPPED
+               NID_MEDIA, state == RECORDER_STATE_OPENED || state == RECORDER_STATE_STOPPED || state == RECORDER_STATE_STOPPING
                || state == RECORDER_STATE_ENDOF_FILE || state == RECORDER_STATE_ERROR
                           , E_INVALID_STATE, E_INVALID_STATE, "[E_INVALID_STATE] VideoRecorder is in an invalid state:%d", state);