try to fix non-stopped vlc processes

Author: Zabrimus

process_unix.cpp

@@ -484,12 +484,12 @@ void Process::kill(bool force) noexcept {
   std::lock_guard<std::mutex> lock(close_mutex);
   if(data.id > 0 && !closed) {
     if(force) {
-      ::kill(-data.id, SIGTERM);
-      ::kill(data.id, SIGTERM); // Based on comment in https://gitlab.com/eidheim/tiny-process-library/-/merge_requests/29#note_1146144166
+      ::kill(-data.id, SIGKILL);
+      ::kill(data.id, SIGKILL); // Based on comment in https://gitlab.com/eidheim/tiny-process-library/-/merge_requests/29#note_1146144166
     }
     else {
-      ::kill(-data.id, SIGINT);
-      ::kill(data.id, SIGINT);
+      ::kill(-data.id, SIGTERM);
+      ::kill(data.id, SIGTERM);
     }
   }
 }
@@ -499,12 +499,12 @@ void Process::kill(id_type id, bool force) noexcept {
     return;
 
   if(force) {
-    ::kill(-id, SIGTERM);
-    ::kill(id, SIGTERM);
+    ::kill(-id, SIGKILL);
+    ::kill(id, SIGKILL);
   }
   else {
-    ::kill(-id, SIGINT);
-    ::kill(id, SIGINT);
+    ::kill(-id, SIGTERM);
+    ::kill(id, SIGTERM);
   }
 }
 

streambasehandler.cpp

@@ -75,10 +75,6 @@ bool StreamBaseHandler::streamVideo(const m3u_stream &stream) {
     return true;
 }
 
-bool StreamBaseHandler::isRunning(int &exit_status) {
-    return streamHandler->try_get_exit_status(exit_status);
-}
-
 bool StreamBaseHandler::streamAudio(const m3u_stream &stream) {
     // sanity check
     stop();
@@ -152,10 +148,17 @@ bool StreamBaseHandler::streamAudio(const m3u_stream &stream) {
 
 void StreamBaseHandler::stop() {
     if (streamHandler!=nullptr) {
+        int pid = streamHandler->get_id();
+
         streamHandler->kill(true);
         streamHandler->get_exit_status();
         delete streamHandler;
         streamHandler = nullptr;
+
+
+        if (0 == kill(pid, 0)) {
+            printf("PID still exists....: %d\n", pid);
+        }
     }
 
     std::lock_guard<std::mutex> guard(queueMutex);
@@ -165,6 +168,11 @@ void StreamBaseHandler::stop() {
 
 int StreamBaseHandler::popPackets(unsigned char *bufferAddrP, unsigned int bufferLenP) {
     std::lock_guard<std::mutex> guard(queueMutex);
+
+    if (streamHandler == nullptr) {
+        return 0;
+    }
+
     if (!tsPackets.empty()) {
         std::string front = tsPackets.front();
 

streambasehandler.h

@@ -17,7 +17,6 @@ class StreamBaseHandler {
     bool streamVideo(const m3u_stream &stream);
     bool streamAudio(const m3u_stream &stream);
     void stop();
-    bool isRunning(int &exit_status);
 
     int popPackets(unsigned char *bufferAddrP, unsigned int bufferLenP);