rework on stream thread handling

Author: Zabrimus

Makefile

@@ -57,7 +57,7 @@ SOFILE = libvdr-$(PLUGIN).so
 
 ### Libraries
 
-LIBS = $(shell curl-config --libs) -lssl -lcrypto
+LIBS = $(shell curl-config --libs) -lssl -lcrypto -lpthread
 
 ### Includes and Defines (add further entries here):
 
@@ -82,8 +82,8 @@ OBJS = $(PLUGIN).o common.o config.o device.o pidscanner.o \
 	protocolcurl.o protocolext.o protocolfile.o protocolhttp.o \
 	protocoludp.o sectionfilter.o setup.o sidscanner.o socket.o \
 	protocolm3u.o protocolradio.o protocolstream.o \
-	m3u8handler.o process.o process_unix.o ffmpeghandler.o streambasehandler.o \
-	vlchandler.o source.o statistics.o streamer.o radioimage.o
+	m3u8handler.o process.o process_unix.o streambasehandler.o \
+	source.o statistics.o streamer.o radioimage.o
 
 ### The main target:
 

ffmpeghandler.cpp

@@ -3,11 +3,10 @@
 #include "protocolm3u.h"
 #include "common.h"
 #include "config.h"
-#include "ffmpeghandler.h"
-#include "vlchandler.h"
+#include "streambasehandler.h"
 #include "log.h"
 
-cIptvProtocolM3U::cIptvProtocolM3U() : isActiveM(false), handler(nullptr) {
+cIptvProtocolM3U::cIptvProtocolM3U() : isActiveM(false), handler("M3U") {
     debug1("%s", __PRETTY_FUNCTION__);
 }
 
@@ -16,14 +15,12 @@ cIptvProtocolM3U::~cIptvProtocolM3U() {
 
     // Drop open handles
     cIptvProtocolM3U::Close();
-
-    delete handler;
-    handler = nullptr;
+    handler.stop();
 }
 
 int cIptvProtocolM3U::Read(unsigned char *bufferAddrP, unsigned int bufferLenP) {
     // debug16("%s (, %u)", __PRETTY_FUNCTION__, bufferLenP);
-    return handler->popPackets(bufferAddrP, bufferLenP);
+    return handler.popPackets(bufferAddrP, bufferLenP);
 }
 
 bool cIptvProtocolM3U::Open() {
@@ -69,8 +66,11 @@ bool cIptvProtocolM3U::Open() {
             }
         }
 
+        handler.setChannelId(channelId);
+        handler.setHandlerType(handlerType);
+
         m3u8Handler.printStream(streams);
-        handler->streamVideo(streams);
+        handler.streamVideo(streams);
     }
 
     return true;
@@ -80,9 +80,7 @@ bool cIptvProtocolM3U::Close() {
     debug1("%s", __PRETTY_FUNCTION__);
 
     isActiveM = false;
-    if (handler != nullptr) {
-        handler->stop();
-    }
+    handler.stop();
 
     return true;
 }
@@ -132,7 +130,9 @@ cIptvProtocolM3U::SetSource(SourceParameter parameter) {
     }
 
     channelId = parameter.channelNumber;
+    handlerType = parameter.handlerType;
 
+    /*
     if (handler != nullptr) {
         handler->stop();
     }
@@ -145,7 +145,7 @@ cIptvProtocolM3U::SetSource(SourceParameter parameter) {
     } else if (parameter.handlerType == 'V') {
         handler = new VlcHandler(channelId);
     }
-
+    */
     return true;
 }
 

ffmpeghandler.h

@@ -14,7 +14,8 @@ class cIptvProtocolM3U : public cIptvProtocolIf {
     bool isActiveM;
     int useYtdlp;
     M3u8Handler m3u8Handler;
-    StreamBaseHandler* handler;
+    StreamBaseHandler handler;
+    char handlerType;
 
 public:
     cIptvProtocolM3U();