Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-01-22 22:59:39 +01:00
653 changed files with 2136 additions and 2008 deletions

View File

@@ -288,21 +288,36 @@ CRCInput::~CRCInput()
* stopInput - stop reading rcin for plugins
*
**************************************************************************/
void CRCInput::stopInput()
void CRCInput::stopInput(const bool ext)
{
if (isLocked())
return;
input_stopped = true;
close();
if (ext)
postMsg(NeutrinoMessages::LOCK_RC_EXTERN, 0);
}
bool CRCInput::isLocked(void)
{
return input_stopped;
}
/**************************************************************************
* restartInput - restart reading rcin after calling plugins
*
**************************************************************************/
void CRCInput::restartInput()
void CRCInput::restartInput(const bool ext)
{
if (!isLocked())
return;
close();
open();
input_stopped = false;
if (ext)
postMsg(NeutrinoMessages::UNLOCK_RC_EXTERN, 0);
}
#if 0
//never used