mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 06:18:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rtsp_server

Browse Source 
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1.  0 means no error but also no success.
Debugging and braces improvements in local_camera.
This commit is contained in:
Isaac Connor
2020-12-17 10:16:54 -05:00
parent 8c85c50ce1 08d82fb86a
commit 8d52baeee2
13 changed files with 190 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_thread.cpp
View File

@@ -269,9 +269,9 @@ void *Thread::mThreadFunc( void *arg ) {
}
void Thread::start() {
Debug( 1, "Starting thread" );
Debug(4, "Starting thread" );
if ( isThread() )
throw ThreadException( "Can't self start thread" );
throw ThreadException("Can't self start thread");
mThreadMutex.lock();
if ( !mStarted ) {
pthread_attr_t threadAttrs;
@@ -287,11 +287,11 @@ void Thread::start() {
}
mThreadCondition.wait();
mThreadMutex.unlock();
Debug( 1, "Started thread %d", mPid );
Debug(4, "Started thread %d", mPid);
}
void Thread::join() {
Debug( 1, "Joining thread %d", mPid );
Debug(1, "Joining thread %d", mPid);
if ( isThread() )
throw ThreadException( "Can't self join thread" );
mThreadMutex.lock();