Control order of actions in worker thread

Author: TimSC

v4l2capture.cpp

@@ -990,6 +990,7 @@ class Device_manager_Worker_thread_args
 		}
 
 		this->deviceStarted = 0;
+		printf("Done opening\n");
 		return 1;
 	}
 
@@ -1190,33 +1191,37 @@ class Device_manager_Worker_thread_args
 			if(deviceStarted) this->ReadFrame();
 
 			pthread_mutex_lock(&this->lock);
-			if(this->startDeviceFlag.size() > 0)
+			if(this->openDeviceFlag.size() > 0)
 			{
-				int buffer_count = this->startDeviceFlag[this->startDeviceFlag.size()-1];
-				this->startDeviceFlag.pop_back();
-				this->StartDeviceInternal(buffer_count);
+				std::string devName = this->openDeviceFlag[this->openDeviceFlag.size()-1];
+				this->openDeviceFlag.pop_back();
+				this->OpenDeviceInternal();
 			}
 			pthread_mutex_unlock(&this->lock);
 
 			pthread_mutex_lock(&this->lock);
-			if(this->openDeviceFlag.size() > 0)
+			if(this->startDeviceFlag.size() > 0 && this->openDeviceFlag.size() == 0)
 			{
-				std::string devName = this->openDeviceFlag[this->openDeviceFlag.size()-1];
-				this->openDeviceFlag.pop_back();
-				this->OpenDeviceInternal();
+				int buffer_count = this->startDeviceFlag[this->startDeviceFlag.size()-1];
+				this->startDeviceFlag.pop_back();
+				this->StartDeviceInternal(buffer_count);
 			}
 			pthread_mutex_unlock(&this->lock);
 
 			pthread_mutex_lock(&this->lock);
-			if(this->stopDeviceFlag)
+			if(this->stopDeviceFlag 
+				&& this->openDeviceFlag.size() == 0 
+				&& this->startDeviceFlag.size() == 0)
 			{
 				this->StopDeviceInternal();
 				this->stopDeviceFlag = 0;
 			}
 			pthread_mutex_unlock(&this->lock);
 
 			pthread_mutex_lock(&this->lock);
-			if(this->closeDeviceFlag)
+			if(this->closeDeviceFlag && !this->stopDeviceFlag 
+				&& this->openDeviceFlag.size() == 0 
+				&& this->startDeviceFlag.size() == 0)
 			{
 				this->CloseDeviceInternal();
 				this->closeDeviceFlag = 0;