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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e691bceb94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-03 13:04:12 +01:00
parent 5f3dc3b6be e89f1f32e5
commit 533ef50a9f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/widget/menue.cpp
View File

@@ -2411,7 +2411,6 @@ bool CZapProtection::check()
hint = NONEXISTANT_LOCALE; hint = NONEXISTANT_LOCALE;
int res; int res;
std::string cPIN; std::string cPIN;
char systemstr[128];
do do
{ {
cPIN = ""; cPIN = "";
@@ -2421,9 +2420,6 @@ bool CZapProtection::check()
res = PINInput->exec(getParent(), ""); res = PINInput->exec(getParent(), "");
delete PINInput; delete PINInput;
cPIN[4] = 0; cPIN[4] = 0;
strcpy(systemstr, CONFIGDIR "/pinentered.sh ");
strcat(systemstr, cPIN.c_str());
system(systemstr);
hint = LOCALE_PINPROTECTION_WRONGCODE; hint = LOCALE_PINPROTECTION_WRONGCODE;
} while ( (cPIN != *validPIN) && !cPIN.empty() && } while ( (cPIN != *validPIN) && !cPIN.empty() &&

5
src/zapit/src/zapit.cpp
View File

@@ -2280,8 +2280,13 @@ bool CZapit::StartPlayBack(CZapitChannel *thisChannel)
#if ! HAVE_AZBOX_HARDWARE #if ! HAVE_AZBOX_HARDWARE
/* start video */ /* start video */
if (video_pid) { if (video_pid) {
#if HAVE_COOL_HARDWARE
videoDecoder->Start(0, pcr_pid, video_pid);
videoDemux->Start();
#else
videoDemux->Start(); videoDemux->Start();
videoDecoder->Start(0, pcr_pid, video_pid); videoDecoder->Start(0, pcr_pid, video_pid);
#endif
} }
#endif #endif
#ifdef USE_VBI #ifdef USE_VBI