mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- use new exec_controlscript() function

Browse Source 
Conflicts:
	src/driver/record.cpp
	src/global.h
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-01-26 17:05:44 +01:00
committed by Thilo Graf
parent b027bec157
commit 9c77ed6269
8 changed files with 51 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/audioplayer.cpp
View File

@@ -90,8 +90,8 @@ extern cVideo * videoDecoder;
// check if files to be added are already in the playlist
#define AUDIOPLAYER_CHECK_FOR_DUPLICATES
#define AUDIOPLAYER_START_SCRIPT CONTROLDIR "/audioplayer.start"
#define AUDIOPLAYER_END_SCRIPT CONTROLDIR "/audioplayer.end"
#define AUDIOPLAYER_START_SCRIPT "audioplayer.start"
#define AUDIOPLAYER_END_SCRIPT "audioplayer.end"
#define DEFAULT_RADIOSTATIONS_XMLFILE CONFIGDIR "/radio-stations.xml"
#define DEFAULT_RADIOFAVORITES_XMLFILE CONFIGDIR "/radio-favorites.xml"
@@ -316,9 +316,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
printf("[audioplayer.cpp] wakeup_hdd(%s)\n", g_settings.network_nfs_audioplayerdir.c_str());
wakeup_hdd(g_settings.network_nfs_audioplayerdir.c_str()/*,true*/);
puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT ".");
if (my_system(AUDIOPLAYER_START_SCRIPT) != 0)
perror(AUDIOPLAYER_START_SCRIPT " failed");
exec_controlscript(AUDIOPLAYER_START_SCRIPT);
int res = show();
@@ -328,9 +326,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_frameBuffer->useBackground(usedBackground);
m_frameBuffer->paintBackground();
puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT ".");
if (my_system(AUDIOPLAYER_END_SCRIPT) != 0)
perror(AUDIOPLAYER_END_SCRIPT " failed");
exec_controlscript(AUDIOPLAYER_END_SCRIPT);
//g_Zapit->unlockPlayBack();
CZapit::getInstance()->EnablePlayback(true);