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

neutrino.cpp: update for new streamts code,

Browse Source 
keep stream running in soft-standby
This commit is contained in:
[CST] Focus
2012-11-08 19:13:22 +04:00
parent ae6cbc9479
commit e5a2b0336c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/neutrino.cpp
View File

@@ -56,6 +56,7 @@
#include <driver/record.h> #include <driver/record.h>
#include <driver/screenshot.h> #include <driver/screenshot.h>
#include <driver/volume.h> #include <driver/volume.h>
#include <driver/streamts.h>
#include "gui/audioplayer.h" #include "gui/audioplayer.h"
#include "gui/bouquetlist.h" #include "gui/bouquetlist.h"
@@ -133,10 +134,6 @@ t_channel_id standby_channel_id;
static pthread_t timer_thread; static pthread_t timer_thread;
void * timerd_main_thread(void *data); void * timerd_main_thread(void *data);
extern int streamts_stop;
void * streamts_main_thread(void *data);
static pthread_t stream_thread ;
void * nhttpd_main_thread(void *data); void * nhttpd_main_thread(void *data);
static pthread_t nhttpd_thread ; static pthread_t nhttpd_thread ;
@@ -1823,7 +1820,7 @@ TIMER_START();
pthread_create (&nhttpd_thread, NULL, nhttpd_main_thread, (void *) NULL); pthread_create (&nhttpd_thread, NULL, nhttpd_main_thread, (void *) NULL);
pthread_create (&stream_thread, NULL, streamts_main_thread, (void *) NULL); CStreamManager::getInstance()->Start();
#ifndef DISABLE_SECTIONSD #ifndef DISABLE_SECTIONSD
CSectionsdClient::epg_config config; CSectionsdClient::epg_config config;
@@ -3098,7 +3095,8 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
g_Radiotext->radiotext_stop(); g_Radiotext->radiotext_stop();
if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus()) { bool stream_status = CStreamManager::getInstance()->StreamStatus();
if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus() && !stream_status) {
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
} else { } else {
g_Zapit->stopPlayBack(); g_Zapit->stopPlayBack();
@@ -3434,7 +3432,6 @@ bool CNeutrinoApp::changeNotify(const neutrino_locale_t OptionName, void * /*dat
**************************************************************************************/ **************************************************************************************/
void stop_daemons(bool stopall) void stop_daemons(bool stopall)
{ {
streamts_stop = 1;
dvbsub_close(); dvbsub_close();
tuxtxt_stop(); tuxtxt_stop();
tuxtxt_close(); tuxtxt_close();
@@ -3447,7 +3444,7 @@ void stop_daemons(bool stopall)
pthread_cancel(nhttpd_thread); pthread_cancel(nhttpd_thread);
pthread_join(nhttpd_thread, NULL); pthread_join(nhttpd_thread, NULL);
printf("httpd shutdown done\n"); printf("httpd shutdown done\n");
pthread_join(stream_thread, NULL); CStreamManager::getInstance()->Stop();
if(stopall) { if(stopall) {
printf("timerd shutdown\n"); printf("timerd shutdown\n");
g_Timerd->shutdown(); g_Timerd->shutdown();