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

Use scoped window timeout

Browse Source
This commit is contained in:
Andrzej Rybczak
2017-02-13 10:55:46 +01:00
parent 05bf53d0ab
commit 0ab5fbb809
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions.cpp
View File

@@ -2895,8 +2895,7 @@ void seek(SearchDirection sd)
unsigned songpos = Status::State::elapsedTime(); unsigned songpos = Status::State::elapsedTime();
auto t = Timer; auto t = Timer;
int old_timeout = wFooter->getTimeout(); NC::Window::ScopedTimeout stimeout{*wFooter, BaseScreen::defaultWindowTimeout};
wFooter->setTimeout(BaseScreen::defaultWindowTimeout);
// Accept single action of a given type or action chain for which all actions // Accept single action of a given type or action chain for which all actions
// can be run and one of them is of the given type. This will still not work // can be run and one of them is of the given type. This will still not work
@@ -3007,8 +3006,6 @@ void seek(SearchDirection sd)
} }
SeekingInProgress = false; SeekingInProgress = false;
Mpd.Seek(Status::State::currentSongPosition(), songpos); Mpd.Seek(Status::State::currentSongPosition(), songpos);
wFooter->setTimeout(old_timeout);
} }
void findItem(const SearchDirection direction) void findItem(const SearchDirection direction)

19
src/curses/window.h
View File

@@ -254,6 +254,25 @@ struct Window
PromptHook m_hook; PromptHook m_hook;
}; };
struct ScopedTimeout
{
ScopedTimeout(Window &w, int new_timeout)
: m_w(w)
{
m_timeout = w.getTimeout();
w.setTimeout(new_timeout);
}
~ScopedTimeout()
{
m_w.setTimeout(m_timeout);
}
private:
Window &m_w;
int m_timeout;
};
Window() : m_window(nullptr) { } Window() : m_window(nullptr) { }
/// Constructs an empty window with given parameters /// Constructs an empty window with given parameters