From e55038bc46317d699570b6efa26ce6757c024a54 Mon Sep 17 00:00:00 2001
From: Marco <marco@ddvtech.nl>
Date: Mon, 26 Dec 2022 15:57:49 +0100
Subject: [PATCH] Convert AAC and EBML outputs to properly use generic
 fileTarget functionality

Change-Id: I2eff10361d11de0639f8d0e97e4379ebc050155b
---
 src/output/output_aac.cpp  |  1 +
 src/output/output_aac.h    |  1 +
 src/output/output_ebml.cpp | 24 ------------------------
 src/output/output_ebml.h   |  4 ++++
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/output/output_aac.cpp b/src/output/output_aac.cpp
index 340482b0..7e820e81 100644
--- a/src/output/output_aac.cpp
+++ b/src/output/output_aac.cpp
@@ -16,6 +16,7 @@ namespace Mist{
     capa["methods"][0u]["type"] = "html5/audio/aac";
     capa["methods"][0u]["hrn"] = "AAC progressive";
     capa["methods"][0u]["priority"] = 8;
+    capa["push_urls"].append("/*.aac");
 
     JSON::Value opt;
     opt["arg"] = "string";
diff --git a/src/output/output_aac.h b/src/output/output_aac.h
index c28281a9..e83a5740 100644
--- a/src/output/output_aac.h
+++ b/src/output/output_aac.h
@@ -10,6 +10,7 @@ namespace Mist{
     void initialSeek();
 
   private:
+    virtual bool inlineRestartCapable() const{return true;}
     bool isFileTarget(){return isRecording();}
   };
 }// namespace Mist
diff --git a/src/output/output_ebml.cpp b/src/output/output_ebml.cpp
index a6bd721c..f1bf7e3d 100644
--- a/src/output/output_ebml.cpp
+++ b/src/output/output_ebml.cpp
@@ -48,30 +48,6 @@ namespace Mist{
       if (config->getString("target").find(".webm") != std::string::npos){doctype = "webm";}
       initialize();
       if (!M.getLive()){calcVodSizes();}
-      if (!streamName.size()){
-        WARN_MSG("Recording unconnected EBML output to file! Cancelled.");
-        conn.close();
-        return;
-      }
-      if (config->getString("target") == "-"){
-        parseData = true;
-        wantRequest = false;
-        INFO_MSG("Outputting %s to stdout in EBML format", streamName.c_str());
-        return;
-      }
-      if (!M.getValidTracks().size()){
-        INFO_MSG("Stream not available - aborting");
-        conn.close();
-        return;
-      }
-      if (connectToFile(config->getString("target"))){
-        parseData = true;
-        wantRequest = false;
-        INFO_MSG("Recording %s to %s in EBML format", streamName.c_str(),
-                 config->getString("target").c_str());
-        return;
-      }
-      conn.close();
     }
   }
 
diff --git a/src/output/output_ebml.h b/src/output/output_ebml.h
index 4889f403..63a2c5dc 100644
--- a/src/output/output_ebml.h
+++ b/src/output/output_ebml.h
@@ -13,6 +13,10 @@ namespace Mist{
 
   protected:
     virtual bool inlineRestartCapable() const{return true;}
+    bool isFileTarget(){
+      if (config->getString("target").substr(0, 9) != "mkv-exec:"){return true;}
+      return false;
+    }
 
   private:
     bool isRecording();