From 3792f9b97067e17344d0997e2087ffc25ee462db Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Tue, 15 Jul 2008 16:34:02 +0000 Subject: [PATCH] *** empty log message *** --- command.cc | 4 ++-- eventdispatcher.cc | 11 +++++++---- vdr.cc | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/command.cc b/command.cc index 241f538..700de26 100644 --- a/command.cc +++ b/command.cc @@ -889,10 +889,10 @@ void Command::doJustConnected(VConnect* vconnect) boxstack->update(vw); // Enter pre-keys here -// handleCommand(Remote::OK); + handleCommand(Remote::OK); // handleCommand(Remote::ONE); // handleCommand(Remote::SIX); -// handleCommand(Remote::OK); + handleCommand(Remote::OK); // handleCommand(Remote::UP); // handleCommand(Remote::PLAY); // handleCommand(Remote::DOWN); diff --git a/eventdispatcher.cc b/eventdispatcher.cc index f7217f9..9042164 100644 --- a/eventdispatcher.cc +++ b/eventdispatcher.cc @@ -177,10 +177,9 @@ void EventDispatcher::edSleepThisReceiver(EDReceiver* edr) // For blocking version, not callback version. Call with edLock locked #ifndef WIN32 - pthread_cond_init(&edr->cond, NULL); pthread_cond_wait(&edr->cond, &mutex); #else - edr->cond = CreateEvent(NULL,/*FALSE*/TRUE,FALSE,NULL); + ResetEvent(edr->cond); ReleaseMutex(mutex); WaitForSingleObject(edr->cond,INFINITE); ResetEvent(edr->cond); @@ -194,8 +193,10 @@ EDReceiver::EDReceiver() { nomorecalls = false; callinprogress = false; -#ifdef WIN32 - cond=NULL; +#ifndef WIN32 + pthread_cond_init(&cond, NULL); +#else + cond = CreateEvent(NULL,/*FALSE*/TRUE,FALSE,NULL); #endif } @@ -203,5 +204,7 @@ EDReceiver::~EDReceiver() { #ifdef WIN32 if (cond!=NULL) CloseHandle(cond); +#else + pthread_cond_destroy(&cond); #endif } diff --git a/vdr.cc b/vdr.cc index 57ef492..3edf9ea 100644 --- a/vdr.cc +++ b/vdr.cc @@ -727,6 +727,7 @@ int VDR::stopStreaming() if (TEMP_SINGLE_VDR_PR) // this block only needs to be done if it was a live stream // TEMP_SINGLE_VDR_PR will not be set unless we are streaming a channel { + logger->log("VDR", Log::DEBUG, "About to call edUnregister on stream receiver vdrpr"); edUnregister(TEMP_SINGLE_VDR_PR); delete TEMP_SINGLE_VDR_PR; TEMP_SINGLE_VDR_PR = NULL; -- 2.39.5