From fc799dc6bffdeaeeefdaa37d57ce8edbc0617d12 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 6 Feb 2015 19:56:19 +0100 Subject: [PATCH] triple: remove videodecoder hack from dmx destructor --- libtriple/dmx_td.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libtriple/dmx_td.cpp b/libtriple/dmx_td.cpp index 138b044..810a26e 100644 --- a/libtriple/dmx_td.cpp +++ b/libtriple/dmx_td.cpp @@ -34,10 +34,6 @@ #include "dmx_hal.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_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); 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); pdata = NULL; }