From 96cb0c278511defad3e53c2ea2deeaa3a0774df9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 24 Nov 2017 10:54:30 +0100 Subject: [PATCH] movieplayer: just fix indentation Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c64b18450517ffeda68ccbc49d79f8d61d27ccb5 Author: vanhofen Date: 2017-11-24 (Fri, 24 Nov 2017) Origin message was: ------------------ - movieplayer: just fix indentation ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 4636590ad..750e48a3a 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1151,23 +1151,21 @@ bool CMoviePlayerGui::getLiveUrl(const std::string &url, const std::string &scri std::string _script = script; if (_script.find("/") == std::string::npos) - //NI + { + std::string _s = g_settings.livestreamScriptPath + "/" + _script; + printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str()); + if (!file_exists(_s.c_str())) { - std::string _s = g_settings.livestreamScriptPath + "/" + _script; + _s = std::string(WEBTVDIR_VAR) + "/" + _script; printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str()); - if (!file_exists(_s.c_str())) - { - _s = std::string(WEBTVDIR_VAR) + "/" + _script; - printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str()); - } - if (!file_exists(_s.c_str())) - { - _s = std::string(WEBTVDIR) + "/" + _script; - printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str()); - } - _script = _s; } - + if (!file_exists(_s.c_str())) + { + _s = std::string(WEBTVDIR) + "/" + _script; + printf("[%s:%s:%d] script: %s\n", __file__, __func__, __LINE__, _s.c_str()); + } + _script = _s; + } size_t pos = _script.find(".lua"); if (!file_exists(_script.c_str()) || (pos == std::string::npos) || (_script.length()-pos != 4)) { printf(">>>>> [%s:%s:%d] script error\n", __file__, __func__, __LINE__);