frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

merge commit '123fc5f' into datathread

Browse Source 
Conflicts:
	tuner.c
	tuner.h
This commit is contained in:
nafets227 2014-11-09 18:06:16 +01:00
commit c5966add39
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tuner.c
View File

@ -141,30 +141,31 @@ void cSatipTuner::DataTimeoutCallback(void *objP)
obj->reconnectM = true; obj->reconnectM = true;
} }
int cSatipTuner::RtspDebugCallback(CURL *handleP, curl_infotype typeP, char *dataP, size_t sizeP, void *userPtrP) int cSatipTuner::DebugCallback(CURL *handleP, curl_infotype typeP, char *dataP, size_t sizeP, void *userPtrP)
{ {
//cSatipTuner *obj = reinterpret_cast<cSatipTuner *>(userPtrP); cSatipTuner *obj = reinterpret_cast<cSatipTuner *>(userPtrP);
//debug("cSatipTuner::%s(%d) [device %d]", __FUNCTION__, (int)typeP, obj->deviceM->GetId());
if (obj) {
switch (typeP) { switch (typeP) {
case CURLINFO_TEXT: case CURLINFO_TEXT:
debug("RTSP INFO %.*s", (int)sizeP, dataP); debug("cSatipTuner::%s(%d): RTSP INFO %.*s", __FUNCTION__, obj->deviceM->GetId(), (int)sizeP, dataP);
break; break;
case CURLINFO_HEADER_IN: case CURLINFO_HEADER_IN:
debug("RTSP HEAD< %.*s", (int)sizeP, dataP); debug("cSatipTuner::%s(%d): RTSP HEAD <<< %.*s", __FUNCTION__, obj->deviceM->GetId(), (int)sizeP, dataP);
break; break;
case CURLINFO_HEADER_OUT: case CURLINFO_HEADER_OUT:
debug("RTSP HEAD> %.*s", (int)sizeP, dataP); debug("cSatipTuner::%s(%d): RTSP HEAD >>> %.*s", __FUNCTION__, obj->deviceM->GetId(), (int)sizeP, dataP);
break; break;
case CURLINFO_DATA_IN: case CURLINFO_DATA_IN:
debug("RTSP DATA< %.*s", (int)sizeP, dataP); debug("cSatipTuner::%s(%d): RTSP DATA <<< %.*s", __FUNCTION__, obj->deviceM->GetId(), (int)sizeP, dataP);
break; break;
case CURLINFO_DATA_OUT: case CURLINFO_DATA_OUT:
debug("RTSP DATA> %.*s", (int)sizeP, dataP); debug("cSatipTuner::%s(%d): RTSP DATA >>> %.*s", __FUNCTION__, obj->deviceM->GetId(), (int)sizeP, dataP);
break; break;
default: default:
break; break;
} }
}
return 0; return 0;
} }

2
tuner.h
View File

@ -33,7 +33,7 @@ private:
static size_t HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP); static size_t HeaderCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
static size_t DataCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP); static size_t DataCallback(void *ptrP, size_t sizeP, size_t nmembP, void *dataP);
static void DataTimeoutCallback(void *objP); static void DataTimeoutCallback(void *objP);
static int RtspDebugCallback(CURL *handleP, curl_infotype typeP, char *dataP, size_t sizeP, void *userPtrP); static int DebugCallback(CURL *handleP, curl_infotype typeP, char *dataP, size_t sizeP, void *userPtrP);
cSatipTunerDataThread dataThreadM; cSatipTunerDataThread dataThreadM;
cCondWait sleepM; cCondWait sleepM;