From f051971c61ac7ff4f63e8c93cc80b021fefa3463 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 24 Dec 2014 23:21:57 +0100 Subject: [PATCH] screensaver: just add mp3-?.jpg when using DATADIR "/neutrino/icons" ... ... to get the same behavior as usual Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4cf5e8ffd1a411e18385e50ee45fb609030fa2bb Author: vanhofen Date: 2014-12-24 (Wed, 24 Dec 2014) Origin message was: ------------------ - screensaver: just add mp3-?.jpg when using DATADIR "/neutrino/icons" ... ... to get the same behavior as usual ------------------ This commit was generated by Migit --- src/gui/screensaver.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp index fe1a095a9..3f30fe24a 100644 --- a/src/gui/screensaver.cpp +++ b/src/gui/screensaver.cpp @@ -161,6 +161,18 @@ bool CScreenSaver::ReadDir() str += "/"; str += (*dirpointer).d_name; + + if ((std::string) dir_name == DATADIR "/neutrino/icons") + { + /* + backward compatiblity: + just add the standard mp3-?.jpg pictures + to get the same behavior as usual + */ + if (str.find("/mp3-") == string::npos) + continue; + } + v_bg_files.push_back(str); } }