kopia lustrzana https://github.com/f4exb/sdrangel
				
				
				
			DATV: shut down video player before destruction
							rodzic
							
								
									cc8bbf6559
								
							
						
					
					
						commit
						7e375079fe
					
				|  | @ -63,6 +63,7 @@ void DATVDemodBaseband::startWork() | |||
| void DATVDemodBaseband::stopWork() | ||||
| { | ||||
|     QMutexLocker mutexLocker(&m_mutex); | ||||
|     m_sink.stopVideo(); | ||||
|     disconnect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); | ||||
|     QObject::disconnect( | ||||
|         &m_sampleFifo, | ||||
|  |  | |||
|  | @ -69,6 +69,14 @@ DATVDemodSink::~DATVDemodSink() | |||
|         m_objVideoStream->deleteLater(); | ||||
|     } | ||||
| 
 | ||||
|     stopVideo(); | ||||
|     CleanUpDATVFramework(); | ||||
| 
 | ||||
|     delete m_objRFFilter; | ||||
| } | ||||
| 
 | ||||
| void DATVDemodSink::stopVideo() | ||||
| { | ||||
|     if (m_objRenderThread) | ||||
|     { | ||||
|         if (m_objRenderThread->isRunning()) | ||||
|  | @ -78,10 +86,6 @@ DATVDemodSink::~DATVDemodSink() | |||
|             m_objRenderThread->wait(); | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     CleanUpDATVFramework(); | ||||
| 
 | ||||
|     delete m_objRFFilter; | ||||
| } | ||||
| 
 | ||||
| bool DATVDemodSink::setTVScreen(TVScreen *objScreen) | ||||
|  |  | |||
|  | @ -70,6 +70,7 @@ public: | |||
|     bool videoDecodeOK(); | ||||
| 
 | ||||
|     bool playVideo(); | ||||
|     void stopVideo(); | ||||
| 
 | ||||
|     int GetSampleRate(); | ||||
|     double getMagSq() const { return m_objMagSqAverage; } //!< Beware this is scaled to 2^30
 | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 f4exb
						f4exb