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

fix conflict

Browse Source
This commit is contained in:
[CST] Focus
2012-06-18 14:56:17 +04:00
parent 02f66f3234 41f365f308
commit 5dd54caf54
32 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audioplayer.cpp
View File

@@ -581,7 +581,7 @@ int CAudioPlayerGui::show()
//stop(); // Stop if song is deleted, next song will be startet automat.
}
if (m_selected >= m_playlist.size())
m_selected = m_playlist.size() == 0 ? m_playlist.size() : m_playlist.size() - 1;
m_selected = m_playlist.empty() ? m_playlist.size() : m_playlist.size() - 1;
update = true;
}
}
@@ -2462,7 +2462,7 @@ void CAudioPlayerGui::removeFromPlaylist(long pos)
item->second.erase(pos);
// delete empty entries
if (item->second.size() == 0)
if (item->second.empty())
{
m_title2Pos.erase(item);
}
@@ -2522,7 +2522,7 @@ void CAudioPlayerGui::selectTitle(unsigned char selectionChar)
}
else
{
if (it->second.size() > 0)
if ( !it->second.empty() )
{
i = *(it->second.begin());
//printf("using begin i: %ld\n",i);