From d7ad0b32074b8de9fcc6cc31f73767630af9e990 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Wed, 30 Apr 2014 15:40:48 +0200 Subject: [PATCH] Properly fixed earlier MistIn fixes --- src/input/input_dtsc.cpp | 13 ++++++++++--- src/input/input_flv.cpp | 13 ++++++++++--- src/input/input_ogg.cpp | 13 ++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/input/input_dtsc.cpp b/src/input/input_dtsc.cpp index 6ce289be..5aee145b 100644 --- a/src/input/input_dtsc.cpp +++ b/src/input/input_dtsc.cpp @@ -26,9 +26,16 @@ namespace Mist { std::cerr << "Input from stdin not yet supported" << std::endl; return false; } - if (config->getString("output") == "-") { - std::cerr << "Output to stdout not yet supported" << std::endl; - return false; + if (!config->getBool("player")){ + if (config->getString("output") == "-") { + std::cerr << "Output to stdout not yet supported" << std::endl; + return false; + } + }else{ + if (config->getString("output") != "-") { + std::cerr << "File output in player mode not supported" << std::endl; + return false; + } } //open File diff --git a/src/input/input_flv.cpp b/src/input/input_flv.cpp index 15bcef7e..7c93b96f 100644 --- a/src/input/input_flv.cpp +++ b/src/input/input_flv.cpp @@ -26,9 +26,16 @@ namespace Mist { std::cerr << "Input from stdin not yet supported" << std::endl; return false; } - if (config->getString("output") == "-") { - std::cerr << "Output to stdout not yet supported" << std::endl; - return false; + if (!config->getBool("player")){ + if (config->getString("output") == "-") { + std::cerr << "Output to stdout not yet supported" << std::endl; + return false; + } + }else{ + if (config->getString("output") != "-") { + std::cerr << "File output in player mode not supported" << std::endl; + return false; + } } //open File diff --git a/src/input/input_ogg.cpp b/src/input/input_ogg.cpp index 8e7b79c4..64acf36b 100644 --- a/src/input/input_ogg.cpp +++ b/src/input/input_ogg.cpp @@ -24,9 +24,16 @@ namespace Mist { std::cerr << "Input from stdin not yet supported" << std::endl; return false; } - if (config->getString("output") == "-") { - std::cerr << "Output to stdout not yet supported" << std::endl; - return false; + if (!config->getBool("player")){ + if (config->getString("output") == "-") { + std::cerr << "Output to stdout not yet supported" << std::endl; + return false; + } + }else{ + if (config->getString("output") != "-") { + std::cerr << "File output in player mode not supported" << std::endl; + return false; + } } //open File