From f9cdfa5d2b7825ac811d6af0100f414c9f2d15ce Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 15 Feb 2009 23:08:15 +0100 Subject: [PATCH] another externs removed --- src/browser.cpp | 2 +- src/global.h | 5 +---- src/media_library.cpp | 2 +- src/ncmpcpp.cpp | 14 ++++++-------- src/playlist.cpp | 3 +++ src/playlist.h | 3 +++ src/playlist_editor.cpp | 2 +- src/search_engine.cpp | 2 +- src/status.cpp | 4 ++-- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/browser.cpp b/src/browser.cpp index d9615ca0..1258b0be 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -185,7 +185,7 @@ void Browser::SpacePressed() block_item_list_update = 1; if (Config.ncmpc_like_songs_adding && w->isBold()) { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; long long hash = w->Current().song->GetHash(); for (size_t i = 0; i < myPlaylist->Main()->Size(); i++) { diff --git a/src/global.h b/src/global.h index 93d6886c..a01b0455 100644 --- a/src/global.h +++ b/src/global.h @@ -46,18 +46,15 @@ namespace Global extern pthread_mutex_t curl; # endif - extern bool dont_change_now_playing; extern bool block_progressbar_update; - extern bool block_playlist_update; extern bool block_item_list_update; + extern bool header_update_status; extern bool messages_allowed; extern bool redraw_header; extern std::string volume_state; - extern bool header_update_status; - extern std::vector vFoundPositions; extern int found_pos; } diff --git a/src/media_library.cpp b/src/media_library.cpp index 87528571..44d0abff 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -362,7 +362,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play) } else { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; for (size_t i = 0; i < myPlaylist->Main()->Size(); i++) { if (myPlaylist->Main()->at(i).GetHash() == hash) diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index 8a759d4e..b5aca65e 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -73,9 +73,7 @@ size_t Global::main_height; time_t Global::timer; -bool Global::dont_change_now_playing = 0; bool Global::block_progressbar_update = 0; -bool Global::block_playlist_update = 0; bool Global::block_item_list_update = 0; bool Global::messages_allowed = 0; @@ -204,7 +202,7 @@ int main(int argc, char *argv[]) TraceMpdStatus(); block_item_list_update = 0; - block_playlist_update = 0; + Playlist::BlockUpdate = 0; messages_allowed = 1; // header stuff @@ -437,7 +435,7 @@ int main(int argc, char *argv[]) { if (!myPlaylist->Main()->Empty() && myScreen == myPlaylist) { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; if (myPlaylist->Main()->hasSelected()) { vector list; @@ -451,7 +449,7 @@ int main(int argc, char *argv[]) } else { - dont_change_now_playing = 1; + Playlist::BlockNowPlayingUpdate = 1; myPlaylist->Main()->SetTimeout(50); while (!myPlaylist->Main()->Empty() && Keypressed(input, Key.Delete)) { @@ -466,7 +464,7 @@ int main(int argc, char *argv[]) myPlaylist->Main()->ReadKey(input); } myPlaylist->Main()->SetTimeout(ncmpcpp_window_timeout); - dont_change_now_playing = 0; + Playlist::BlockNowPlayingUpdate = 0; } Mpd->CommitQueue(); } @@ -603,7 +601,7 @@ int main(int argc, char *argv[]) { if (myScreen == myPlaylist && !myPlaylist->Main()->Empty()) { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; myPlaylist->Main()->SetTimeout(50); if (myPlaylist->Main()->hasSelected()) { @@ -706,7 +704,7 @@ int main(int argc, char *argv[]) { if (myScreen == myPlaylist && !myPlaylist->Main()->Empty()) { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; myPlaylist->Main()->SetTimeout(50); if (myPlaylist->Main()->hasSelected()) { diff --git a/src/playlist.cpp b/src/playlist.cpp index c76211ca..4670bb16 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -32,6 +32,9 @@ using std::vector; Playlist *myPlaylist = new Playlist; +bool Playlist::BlockNowPlayingUpdate = 0; +bool Playlist::BlockUpdate = 0; + void Playlist::Init() { w = new Menu(0, main_start_y, COLS, main_height, Config.columns_in_playlist ? Display::Columns(Config.song_columns_list_format) : "", Config.main_color, brNone); diff --git a/src/playlist.h b/src/playlist.h index 63efc376..ce8695f0 100644 --- a/src/playlist.h +++ b/src/playlist.h @@ -48,6 +48,9 @@ class Playlist : public Screen< Menu > int NowPlaying; int OldPlaying; + static bool BlockNowPlayingUpdate; + static bool BlockUpdate; + protected: std::string TotalLength(); }; diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp index af86d012..29ed3e1f 100644 --- a/src/playlist_editor.cpp +++ b/src/playlist_editor.cpp @@ -229,7 +229,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play) } else { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; for (size_t i = 0; i < myPlaylist->Main()->Size(); i++) { if (myPlaylist->Main()->at(i).GetHash() == hash) diff --git a/src/search_engine.cpp b/src/search_engine.cpp index 26a22cb4..5b02ab97 100644 --- a/src/search_engine.cpp +++ b/src/search_engine.cpp @@ -259,7 +259,7 @@ void SearchEngine::SpacePressed() block_item_list_update = 1; if (Config.ncmpc_like_songs_adding && w->isBold()) { - block_playlist_update = 1; + Playlist::BlockUpdate = 1; long long hash = w->Current().second->GetHash(); for (size_t i = 0; i < myPlaylist->Main()->Size(); i++) { diff --git a/src/status.cpp b/src/status.cpp index d2dd4c6e..6e29eaa2 100644 --- a/src/status.cpp +++ b/src/status.cpp @@ -147,7 +147,7 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *) wFooter->Bold(1); wFooter->GetXY(sx, sy); - if ((myPlaylist->NowPlaying != Mpd->GetCurrentSongPos() || changed.SongID) && !dont_change_now_playing) + if ((myPlaylist->NowPlaying != Mpd->GetCurrentSongPos() || changed.SongID) && !Playlist::BlockNowPlayingUpdate) { myPlaylist->OldPlaying = myPlaylist->NowPlaying; myPlaylist->NowPlaying = Mpd->GetCurrentSongPos(); @@ -161,7 +161,7 @@ void NcmpcppStatusChanged(Connection *Mpd, StatusChanges changed, void *) if (changed.Playlist) { - if (!block_playlist_update) + if (!Playlist::BlockUpdate) { SongList list; size_t playlist_length = Mpd->GetPlaylistLength();