mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

NI \o/

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gui/audioplayer.cpp
View File

@@ -101,8 +101,10 @@ extern cVideo * videoDecoder;
#define AUDIOPLAYER_START_SCRIPT CONFIGDIR "/audioplayer.start"
#define AUDIOPLAYER_END_SCRIPT CONFIGDIR "/audioplayer.end"
#define DEFAULT_RADIOSTATIONS_XMLFILE CONFIGDIR "/radio-stations.xml"
#define DEFAULT_RADIOFAVORITES_XMLFILE CONFIGDIR "/radio-favorites.xml" //NI
const char RADIO_STATION_XML_FILE[] = {DEFAULT_RADIOSTATIONS_XMLFILE};
const char RADIO_FAVORITES_XML_FILE[] = {DEFAULT_RADIOFAVORITES_XMLFILE}; //NI
CAudiofileExt::CAudiofileExt()
: CAudiofile(), firstChar('\0')
@@ -294,7 +296,11 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_audio );
// Stop sectionsd
g_Sectionsd->setPauseScanning(true);
//NI g_Sectionsd->setPauseScanning(true);
//NI
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)
@@ -315,7 +321,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
//g_Zapit->unlockPlayBack();
CZapit::getInstance()->EnablePlayback(true);
// Start Sectionsd
g_Sectionsd->setPauseScanning(false);
//NI g_Sectionsd->setPauseScanning(false);
m_frameBuffer->stopFrame();
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , m_LastMode );
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
@@ -344,6 +350,20 @@ int CAudioPlayerGui::show()
bool clear_before_update = false;
m_key_level = 0;
//NI auto-load favorites
if ((m_inetmode) && (m_playlist.empty()))
{
if (access(RADIO_FAVORITES_XML_FILE, F_OK) == 0)
scanXmlFile(RADIO_FAVORITES_XML_FILE);
}
//NI auto-play first entry from favorites
if (g_settings.inetradio_autostart)
{
if ((m_inetmode) && (!m_playlist.empty()))
play(m_selected);
}
while (loop)
{
updateMetaData();
@@ -407,6 +427,22 @@ int CAudioPlayerGui::show()
else
loop=false;
}
//NI - add RC_favorites for internetradio
else if ((msg == CRCInput::RC_favorites) && (m_inetmode))
{
if (m_key_level == 0)
{
// clear playlist and load RADIO_FAVORITES_XML_FILE
if (access(RADIO_FAVORITES_XML_FILE, F_OK) == 0)
{
if (!m_playlist.empty())
clearPlaylist();
scanXmlFile(RADIO_FAVORITES_XML_FILE);
clear_before_update = true;
update = true;
}
}
}
else if (msg == CRCInput::RC_left)
{
if (m_key_level == 1)