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

comment out usage of redraw_screen variable (it's not needed for now)

Browse Source
This commit is contained in:
Andrzej Rybczak
2008-12-15 22:13:06 +01:00
parent 8c40f046b9
commit f787895054
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ncmpcpp.cpp
View File

@@ -146,7 +146,7 @@ bool block_playlist_update = 0;
bool block_item_list_update = 0; bool block_item_list_update = 0;
bool messages_allowed = 0; bool messages_allowed = 0;
bool redraw_screen = 0; //bool redraw_screen = 0;
bool redraw_header = 1; bool redraw_header = 1;
bool reload_lyrics = 0; bool reload_lyrics = 0;
@@ -712,10 +712,10 @@ int main(int argc, char *argv[])
mEditorTags->Refresh(); mEditorTags->Refresh();
} }
if (redraw_screen && wCurrent == mEditorTagTypes && mEditorTagTypes->Choice() < 13) if (/*redraw_screen && */wCurrent == mEditorTagTypes && mEditorTagTypes->Choice() < 13)
{ {
mEditorTags->Refresh(); mEditorTags->Refresh();
redraw_screen = 0; // redraw_screen = 0;
} }
else if (mEditorTagTypes->Choice() >= 13) else if (mEditorTagTypes->Choice() >= 13)
mEditorTags->Window::Clear(); mEditorTags->Window::Clear();
@@ -737,7 +737,7 @@ int main(int argc, char *argv[])
wCurrent->Display(); wCurrent->Display();
else else
wCurrent->Refresh(); wCurrent->Refresh();
redraw_screen = 0; // redraw_screen = 0;
wCurrent->ReadKey(input); wCurrent->ReadKey(input);
if (input == ERR) if (input == ERR)
@@ -778,8 +778,8 @@ int main(int argc, char *argv[])
mEditorTags->Clear(0); mEditorTags->Clear(0);
mEditorTagTypes->Refresh(); mEditorTagTypes->Refresh();
} }
else if (wCurrent == mEditorTagTypes) // else if (wCurrent == mEditorTagTypes)
redraw_screen = 1; // redraw_screen = 1;
# endif // HAVE_TAGLIB_H # endif // HAVE_TAGLIB_H
} }
} }
@@ -839,7 +839,7 @@ int main(int argc, char *argv[])
} }
else if (input == KEY_RESIZE) else if (input == KEY_RESIZE)
{ {
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
if (COLS < 20 || LINES < 5) if (COLS < 20 || LINES < 5)
@@ -1129,7 +1129,7 @@ int main(int argc, char *argv[])
wCurrent->Clear(); wCurrent->Clear();
wCurrent = wPrev; wCurrent = wPrev;
current_screen = prev_screen; current_screen = prev_screen;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
if (current_screen == csLibrary) if (current_screen == csLibrary)
{ {
@@ -1570,7 +1570,7 @@ int main(int argc, char *argv[])
else else
ShowMessage("Aborted!"); ShowMessage("Aborted!");
curs_set(0); curs_set(0);
redraw_screen = 1; // redraw_screen = 1;
UnlockStatusbar(); UnlockStatusbar();
} }
break; break;
@@ -1601,7 +1601,7 @@ int main(int argc, char *argv[])
current_screen = csOther; current_screen = csOther;
__deal_with_filenames(list); __deal_with_filenames(list);
current_screen = csTagEditor; current_screen = csTagEditor;
redraw_screen = 1; // redraw_screen = 1;
REFRESH_TAG_EDITOR_SCREEN; REFRESH_TAG_EDITOR_SCREEN;
} }
else if (wCurrent == mEditorTags) else if (wCurrent == mEditorTags)
@@ -1667,7 +1667,7 @@ int main(int argc, char *argv[])
UnlockStatusbar(); UnlockStatusbar();
for (SongList::iterator it = list.begin(); it != list.end(); it++) for (SongList::iterator it = list.begin(); it != list.end(); it++)
(**it.*set)(new_tag); (**it.*set)(new_tag);
redraw_screen = 1; // redraw_screen = 1;
} }
else if (wCurrent == mEditorTags && set != NULL) else if (wCurrent == mEditorTags && set != NULL)
{ {
@@ -1816,7 +1816,7 @@ int main(int argc, char *argv[])
ShowMessage("Switched to %s view", Config.albums_in_tag_editor ? "albums" : "directories"); ShowMessage("Switched to %s view", Config.albums_in_tag_editor ? "albums" : "directories");
mEditorLeftCol->Display(); mEditorLeftCol->Display();
mEditorTags->Clear(0); mEditorTags->Clear(0);
redraw_screen = 1; // redraw_screen = 1;
} }
# endif // HAVE_TAGLIB_H # endif // HAVE_TAGLIB_H
else if (current_screen == csLyrics) else if (current_screen == csLyrics)
@@ -1955,7 +1955,7 @@ int main(int argc, char *argv[])
mPlaylist->DeleteOption(*it); mPlaylist->DeleteOption(*it);
} }
ShowMessage("Selected items deleted!"); ShowMessage("Selected items deleted!");
redraw_screen = 1; // redraw_screen = 1;
} }
else else
{ {
@@ -2019,7 +2019,7 @@ int main(int argc, char *argv[])
mPlaylistEditor->DeleteOption(*it); mPlaylistEditor->DeleteOption(*it);
} }
ShowMessage("Selected items deleted from playlist '%s'!", mPlaylistList->Current().c_str()); ShowMessage("Selected items deleted from playlist '%s'!", mPlaylistList->Current().c_str());
redraw_screen = 1; // redraw_screen = 1;
} }
else else
{ {
@@ -2398,7 +2398,7 @@ int main(int argc, char *argv[])
mPlaylist->SetItemDisplayer(Config.columns_in_playlist ? DisplaySongInColumns : DisplaySong); mPlaylist->SetItemDisplayer(Config.columns_in_playlist ? DisplaySongInColumns : DisplaySong);
mPlaylist->SetItemDisplayerUserData(Config.columns_in_playlist ? &Config.song_columns_list_format : &Config.song_list_format); mPlaylist->SetItemDisplayerUserData(Config.columns_in_playlist ? &Config.song_columns_list_format : &Config.song_list_format);
mPlaylist->SetTitle(Config.columns_in_playlist ? DisplayColumns(Config.song_columns_list_format) : ""); mPlaylist->SetTitle(Config.columns_in_playlist ? DisplayColumns(Config.song_columns_list_format) : "");
redraw_screen = 1; // redraw_screen = 1;
} }
else if (Keypressed(input, Key.ToggleAutoCenter)) else if (Keypressed(input, Key.ToggleAutoCenter))
{ {
@@ -2878,7 +2878,7 @@ int main(int argc, char *argv[])
size_t id = mDialog->Choice(); size_t id = mDialog->Choice();
redraw_screen = 1; // redraw_screen = 1;
if (current_screen == csLibrary) if (current_screen == csLibrary)
{ {
REFRESH_MEDIA_LIBRARY_SCREEN; REFRESH_MEDIA_LIBRARY_SCREEN;
@@ -3217,7 +3217,7 @@ int main(int argc, char *argv[])
wCurrent->Hide(); wCurrent->Hide();
current_screen = prev_screen; current_screen = prev_screen;
wCurrent = wPrev; wCurrent = wPrev;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
if (current_screen == csLibrary) if (current_screen == csLibrary)
{ {
@@ -3287,7 +3287,7 @@ int main(int argc, char *argv[])
wCurrent->Hide(); wCurrent->Hide();
current_screen = prev_screen; current_screen = prev_screen;
wCurrent = wPrev; wCurrent = wPrev;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
if (current_screen == csLibrary) if (current_screen == csLibrary)
{ {
@@ -3366,7 +3366,7 @@ int main(int argc, char *argv[])
wCurrent->Hide(); wCurrent->Hide();
current_screen = prev_screen; current_screen = prev_screen;
wCurrent = wPrev; wCurrent = wPrev;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
if (current_screen == csLibrary) if (current_screen == csLibrary)
{ {
@@ -3477,7 +3477,7 @@ int main(int argc, char *argv[])
wCurrent = mPlaylist; wCurrent = mPlaylist;
wCurrent->Hide(); wCurrent->Hide();
current_screen = csPlaylist; current_screen = csPlaylist;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
} }
} }
@@ -3491,7 +3491,7 @@ int main(int argc, char *argv[])
wCurrent = mBrowser; wCurrent = mBrowser;
wCurrent->Hide(); wCurrent->Hide();
current_screen = csBrowser; current_screen = csBrowser;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
} }
} }
@@ -3505,7 +3505,7 @@ int main(int argc, char *argv[])
wCurrent = mSearcher; wCurrent = mSearcher;
wCurrent->Hide(); wCurrent->Hide();
current_screen = csSearcher; current_screen = csSearcher;
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
if (!mSearcher->Back().first) if (!mSearcher->Back().first)
{ {
@@ -3526,7 +3526,7 @@ int main(int argc, char *argv[])
mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
REFRESH_MEDIA_LIBRARY_SCREEN; REFRESH_MEDIA_LIBRARY_SCREEN;
@@ -3547,7 +3547,7 @@ int main(int argc, char *argv[])
mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
REFRESH_PLAYLIST_EDITOR_SCREEN; REFRESH_PLAYLIST_EDITOR_SCREEN;
@@ -3572,7 +3572,7 @@ int main(int argc, char *argv[])
mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
redraw_screen = 1; // redraw_screen = 1;
redraw_header = 1; redraw_header = 1;
REFRESH_TAG_EDITOR_SCREEN; REFRESH_TAG_EDITOR_SCREEN;

1
src/status_checker.cpp
View File

@@ -59,7 +59,6 @@ extern bool block_progressbar_update;
extern bool block_playlist_update; extern bool block_playlist_update;
extern bool block_item_list_update; extern bool block_item_list_update;
extern bool redraw_screen;
extern bool redraw_header; extern bool redraw_header;
extern bool reload_lyrics; extern bool reload_lyrics;