mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
eitd/dmx.cpp: delete demux instead of stop in closefd,
add helper to set demux number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bedb877dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -117,11 +117,13 @@ void DMX::close(void)
|
|||||||
void DMX::closefd(void)
|
void DMX::closefd(void)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG_DEMUX
|
#ifdef DEBUG_DEMUX
|
||||||
xprintf(" %s: DMX::closefd, isOpen %d\n", name.c_str(), isOpen());
|
xcprintf(" %s: DMX::closefd, isOpen %d demux #%d", name.c_str(), isOpen(), dmx_num);
|
||||||
#endif
|
#endif
|
||||||
if (isOpen())
|
if (isOpen())
|
||||||
{
|
{
|
||||||
dmx->Stop();
|
//dmx->Stop();
|
||||||
|
delete dmx;
|
||||||
|
dmx = NULL;
|
||||||
fd = -1;
|
fd = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -484,6 +486,9 @@ int DMX::immediate_start(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(dmx == NULL) {
|
if(dmx == NULL) {
|
||||||
|
#ifdef DEBUG_DEMUX
|
||||||
|
xcprintf(" %s: open demux #%d", name.c_str(), dmx_num);
|
||||||
|
#endif
|
||||||
dmx = new cDemux(dmx_num);
|
dmx = new cDemux(dmx_num);
|
||||||
dmx->Open(DMX_PSI_CHANNEL, NULL, dmxBufferSizeInKB*1024UL);
|
dmx->Open(DMX_PSI_CHANNEL, NULL, dmxBufferSizeInKB*1024UL);
|
||||||
}
|
}
|
||||||
|
@@ -126,6 +126,7 @@ public:
|
|||||||
unsigned char get_eit_version(void) { return eit_version; }
|
unsigned char get_eit_version(void) { return eit_version; }
|
||||||
// was useful for debugging...
|
// was useful for debugging...
|
||||||
t_channel_id get_current_service(void) { return current_service; }
|
t_channel_id get_current_service(void) { return current_service; }
|
||||||
|
void setDemux(int dnum) { dmx_num = dnum; }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __sectionsd__dmx_h__ */
|
#endif /* __sectionsd__dmx_h__ */
|
||||||
|
Reference in New Issue
Block a user