Fix stop engine

Author: dagargo

src/engine.c

@@ -536,6 +536,7 @@ ow_engine_init (struct ow_engine *engine, struct ow_device *device,
   int err;
   ow_err_t ret = OW_OK;
 
+  engine->status = OW_ENGINE_STATUS_READY;
   engine->device = device;
   engine->usb.xfr_audio_in = NULL;
   engine->usb.xfr_audio_out = NULL;
@@ -757,7 +758,14 @@ run_audio (void *data)
 					      engine->context->get_time ());
     }
 
-  ow_engine_set_status (engine, OW_ENGINE_STATUS_BOOT);
+  pthread_spin_lock (&engine->lock);
+  if (engine->status <= OW_ENGINE_STATUS_STOP)
+    {
+      pthread_spin_unlock (&engine->lock);
+      return NULL;
+    }
+  engine->status = OW_ENGINE_STATUS_BOOT;
+  pthread_spin_unlock (&engine->lock);
 
   while (1)
     {
@@ -769,12 +777,12 @@ run_audio (void *data)
 
       //status == OW_ENGINE_STATUS_BOOT || status == OW_ENGINE_STATUS_CLEAR
 
-      if (ow_engine_get_status (engine) == OW_ENGINE_STATUS_CLEAR)
+      pthread_spin_lock (&engine->lock);
+      if (engine->status == OW_ENGINE_STATUS_CLEAR)
 	{
 	  engine->status = OW_ENGINE_STATUS_RUN;
 	}
 
-      pthread_spin_lock (&engine->lock);
       if (engine->context->dll)
 	{
 	  if (engine->status == OW_ENGINE_STATUS_BOOT)
@@ -890,7 +898,6 @@ ow_engine_start (struct ow_engine *engine, struct ow_context *context)
 	{
 	  return OW_INIT_ERROR_NO_DLL;
 	}
-      engine->status = OW_ENGINE_STATUS_READY;
     }
 
   debug_print (1, "Starting thread...");
@@ -906,7 +913,8 @@ ow_engine_start (struct ow_engine *engine, struct ow_context *context)
     }
 
   //Wait till the thread has reached the USB loop
-  while (ow_engine_get_status (engine) < OW_ENGINE_STATUS_WAIT)
+  while (ow_engine_get_status (engine) > OW_ENGINE_STATUS_STOP &&
+	 ow_engine_get_status (engine) < OW_ENGINE_STATUS_WAIT)
     {
       usleep (PAUSE_TO_BE_WAITING_USECS);
     }
@@ -962,7 +970,10 @@ inline void
 ow_engine_set_status (struct ow_engine *engine, ow_engine_status_t status)
 {
   pthread_spin_lock (&engine->lock);
-  engine->status = status;
+  if (engine->status >= OW_ENGINE_STATUS_READY)
+    {
+      engine->status = status;
+    }
   pthread_spin_unlock (&engine->lock);
 }
 

src/resampler.c

@@ -567,20 +567,7 @@ ow_resampler_start (struct ow_resampler *resampler,
 void
 ow_resampler_wait (struct ow_resampler *resampler)
 {
-  ow_resampler_status_t status;
-
   ow_engine_wait (resampler->engine);
-
-  if (ow_engine_get_status (resampler->engine) == OW_ENGINE_STATUS_ERROR)
-    {
-      status = OW_RESAMPLER_STATUS_ERROR;
-    }
-  else
-    {
-      status = OW_RESAMPLER_STATUS_STOP;
-    }
-  ow_resampler_set_status (resampler, status);
-
   ow_resampler_report_state (resampler);
 }