- sourceflow tiers: changed back a tier from '-' button to 'b' button. 'b' button is no longer used to exit or cancel a sourceflow tier but is still allowed during the base sourceflow.

This commit is contained in:
Fledge68 2019-05-19 15:33:21 -05:00
parent e11a72d03e
commit 4b26013ac8
4 changed files with 11 additions and 15 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

View File

@ -1086,7 +1086,7 @@ private:
void _sourceFlow(); void _sourceFlow();
int _getSrcFlow(); int _getSrcFlow();
void _setSrcFlow(int version); void _setSrcFlow(int version);
void _srcTierBack(bool home); bool _srcTierBack(bool home);
void _setSrcFlowBg(); void _setSrcFlowBg();
void _mainLoopCommon(bool withCF = false, bool adjusting = false); void _mainLoopCommon(bool withCF = false, bool adjusting = false);
void _netInit(); void _netInit();

View File

@ -399,10 +399,13 @@ int CMenu::main(void)
bUsed = false; bUsed = false;
else else
{ {
if(m_sourceflow)//if exiting sourceflow via b button if(m_sourceflow)//back a tier or exit sourceflow
{ {
m_sourceflow = false; if(!_srcTierBack(false))// back a tier
{
m_sourceflow = false;// if not back a tier then exit sourceflow
_setMainBg(); _setMainBg();
}
_showCF(true); _showCF(true);
continue; continue;
} }
@ -641,22 +644,14 @@ int CMenu::main(void)
else if(BTN_LEFT_REPEAT || RIGHT_STICK_LEFT) else if(BTN_LEFT_REPEAT || RIGHT_STICK_LEFT)
CoverFlow.left(); CoverFlow.left();
else if(BTN_MINUS_PRESSED) else if(BTN_MINUS_PRESSED)
{
if(!m_sourceflow)
CoverFlow.pageUp(); CoverFlow.pageUp();
else
{
_srcTierBack(false);
_showCF(true);
}
}
else if(BTN_PLUS_PRESSED) else if(BTN_PLUS_PRESSED)
{ {
if(!m_sourceflow) if(!m_sourceflow)
CoverFlow.pageDown(); CoverFlow.pageDown();
else else
{ {
_srcTierBack(true); _srcTierBack(true);// back to the 1st sourceflow tier
_showCF(true); _showCF(true);
} }
} }

View File

@ -148,10 +148,10 @@ void CMenu::_setSrcFlow(int version)
m_cfg.setInt(SOURCEFLOW_DOMAIN, "last_cf_mode", curflow); m_cfg.setInt(SOURCEFLOW_DOMAIN, "last_cf_mode", curflow);
} }
void CMenu::_srcTierBack(bool home) bool CMenu::_srcTierBack(bool home)
{ {
if(!sm_tier) if(!sm_tier)
return; return false;
string fn; string fn;
if(home) if(home)
{ {
@ -188,6 +188,7 @@ void CMenu::_srcTierBack(bool home)
srcDomain = m_source.nextDomain().c_str(); srcDomain = m_source.nextDomain().c_str();
} }
_setSrcFlowBg(); _setSrcFlowBg();
return true;
} }
void CMenu::_setSrcFlowBg(void) void CMenu::_setSrcFlowBg(void)