mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

triple: remove videodecoder hack from dmx destructor

Browse Source
This commit is contained in:
Stefan Seyfried
2015-02-06 19:56:19 +01:00
parent 56e6d04719
commit fc799dc6bf
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libtriple/dmx_td.cpp
View File

@@ -34,10 +34,6 @@
#include "dmx_hal.h" #include "dmx_hal.h"
#include "lt_debug.h" #include "lt_debug.h"
/* Ugh... see comment in destructor for details... */
#include "video_hal.h"
extern cVideo *videoDecoder;
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args) #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args)
@@ -102,18 +98,6 @@ cDemux::~cDemux()
{ {
lt_debug("%s #%d fd: %d\n", __FUNCTION__, num, fd); lt_debug("%s #%d fd: %d\n", __FUNCTION__, num, fd);
Close(); Close();
/* in zapit.cpp, videoDemux is deleted after videoDecoder
* in the video watchdog, we access videoDecoder
* the thread still runs after videoDecoder has been deleted
* => set videoDecoder to NULL here to make the check in the
* watchdog thread pick this up.
* This is ugly, but it saves me from changing neutrino
*
* if the delete order in neutrino will ever be changed, this
* will blow up badly :-(
*/
if (dmx_type == DMX_VIDEO_CHANNEL)
videoDecoder = NULL;
free(pdata); free(pdata);
pdata = NULL; pdata = NULL;
} }