Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change namespace Browser into class

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-14 00:43:58 +01:00
parent 6e167d67e2
commit 8653232a2a
14 changed files with 248 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/info.cpp
View File

@@ -28,6 +28,7 @@
# include "helpers.h"
#endif
#include "browser.h"
#include "charset.h"
#include "global.h"
#include "media_library.h"
@@ -94,7 +95,7 @@ void Info::GetSong()
}
else if (
(wCurrent == myPlaylist->Main() && !myPlaylist->Main()->Empty())
|| (wCurrent == mBrowser && mBrowser->Current().type == MPD::itSong)
|| (wCurrent == myBrowser->Main() && myBrowser->Main()->Current().type == MPD::itSong)
|| (wCurrent == mSearcher && !mSearcher->Current().first)
|| (wCurrent == mLibSongs && !mLibSongs->Empty())
|| (wCurrent == mPlaylistEditor && !mPlaylistEditor->Empty())
@@ -111,7 +112,7 @@ void Info::GetSong()
s = &myPlaylist->Main()->at(id);
break;
case csBrowser:
s = mBrowser->at(id).song;
s = myBrowser->Main()->at(id).song;
break;
case csSearcher:
s = mSearcher->at(id).second;
@@ -181,7 +182,7 @@ void Info::GetArtist()
}
else if (
(wCurrent == myPlaylist->Main() && !myPlaylist->Main()->Empty())
|| (wCurrent == mBrowser && mBrowser->Current().type == MPD::itSong)
|| (wCurrent == myBrowser->Main() && myBrowser->Main()->Current().type == MPD::itSong)
|| (wCurrent == mSearcher && !mSearcher->Current().first)
|| (wCurrent == mLibArtists && !mLibArtists->Empty())
|| (wCurrent == mLibSongs && !mLibSongs->Empty())
@@ -205,7 +206,7 @@ void Info::GetArtist()
*artist = myPlaylist->Main()->at(id).GetArtist();
break;
case csBrowser:
*artist = mBrowser->at(id).song->GetArtist();
*artist = myBrowser->Main()->at(id).song->GetArtist();
break;
case csSearcher:
*artist = mSearcher->at(id).second->GetArtist();