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

put mpd connection related things into namespace

Browse Source
This commit is contained in:
Andrzej Rybczak
2008-12-09 10:16:38 +01:00
parent 1d27b8629d
commit 5c0af01cca
13 changed files with 297 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/status_checker.cpp
View File

@@ -26,7 +26,9 @@
#define UPDATE_WINDOW_TITLE WindowTitle(DisplaySong(Mpd->GetCurrentSong(), &Config.song_window_title_format))
extern MPDConnection *Mpd;
using namespace MPD;
extern Connection *Mpd;
extern ncmpcpp_config Config;
extern Menu<Song> *mPlaylist;
@@ -109,7 +111,7 @@ void TraceMpdStatus()
else
block_progressbar_update = !allow_statusbar_unlock;
MPDStatusChanges changes;
StatusChanges changes;
switch (Mpd->GetState())
{
case psStop:
@@ -126,7 +128,7 @@ void TraceMpdStatus()
//wHeader->WriteXY(0,1, IntoStr(now_playing), 1);
}
void NcmpcppErrorCallback(MPDConnection *Mpd, int errorid, string msg, void *)
void NcmpcppErrorCallback(Connection *Mpd, int errorid, const char *msg, void *)
{
if (errorid == MPD_ACK_ERROR_PERMISSION)
{
@@ -139,10 +141,10 @@ void NcmpcppErrorCallback(MPDConnection *Mpd, int errorid, string msg, void *)
wFooter->SetGetStringHelper(TraceMpdStatus);
}
else
ShowMessage("%s", msg.c_str());
ShowMessage("%s", msg);
}
void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *)
void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *)
{
int sx, sy;
wFooter->DisableBB();