mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-11 15:41:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

- revert to svn 2126 to stop some people crying

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2132 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
striper
2012-02-28 08:08:36 +00:00
parent ac3707eccb
commit dc25ebc257
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/driver/streamts.cpp
View File

@@ -247,7 +247,6 @@ void streamts_main_thread(void * /*data*/)
if(st != 0) {
printf("Stopping stream thread\n");
exit_flag = 1;
pthread_cancel(st);
pthread_join(st, NULL);
close(connfd);
}

1
src/neutrino.cpp
View File

@@ -3741,7 +3741,6 @@ void sighandler (int signum)
case SIGINT:
delete CRecordManager::getInstance();
stop_daemons();
delete CFrameBuffer::getInstance();
_exit(0);
default:
break;

5
src/sectionsd/sectionsd.cpp
View File

@@ -2318,14 +2318,10 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
if (scanning && pause)
{
scanning = 0;
dmxCN.request_pause();
pthread_cond_broadcast(&dmxCN.change_cond);
dmxEIT.request_pause();
pthread_cond_broadcast(&dmxEIT.change_cond);
#ifdef ENABLE_FREESATEPG
dmxFSEIT.request_pause();
pthread_cond_broadcast(&dmxFSEIT.change_cond);
#endif
#ifdef UPDATE_NETWORKS
dmxNIT.request_pause();
@@ -2334,6 +2330,7 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
#ifdef ENABLE_PPT
dmxPPT.request_pause();
#endif
scanning = 0;
}
else if (!pause && !scanning)
{

6
src/zapit/lib/zapitclient.cpp
View File

@@ -921,8 +921,10 @@ void CZapitClient::setStandby(const bool enable)
CZapitMessages::commandBoolean msg;
msg.truefalse = enable;
send(CZapitMessages::CMD_SET_STANDBY, (char*)&msg, sizeof(msg));
CZapitMessages::responseCmd response;
CBasicClient::receive_data((char* )&response, sizeof(response));
if(enable) {
CZapitMessages::responseCmd response;
CBasicClient::receive_data((char* )&response, sizeof(response));
}
close_connection();
}

4
src/zapit/src/zapit.cpp
View File

@@ -1520,10 +1520,10 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
if (msgBoolean.truefalse) {
// if(currentMode & RECORD_MODE) videoDecoder->freeze();
enterStandby();
response.cmd = CZapitMessages::CMD_READY;
CBasicServer::send_data(connfd, &response, sizeof(response));
} else
leaveStandby();
response.cmd = CZapitMessages::CMD_READY;
CBasicServer::send_data(connfd, &response, sizeof(response));
break;
}