scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 14:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Key control: restructuralize events a bit

Browse Source
This commit is contained in:
Martin Pulec
2019-10-29 16:02:52 +01:00
parent c72b12491e
commit d0ddfaec03
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/keyboard_control.cpp
View File

@@ -110,10 +110,9 @@ static void restore_old_tio(void)
keyboard_control::keyboard_control(struct module *parent) :
m_root(nullptr),
#ifdef HAVE_TERMIOS_H
m_should_exit_pipe{0, 0},
#else
m_should_exit(false),
m_event_pipe{0, 0},
#endif
m_should_exit(false),
m_started(false),
m_locked_against_changes(true)
{
@@ -140,7 +139,7 @@ void keyboard_control::start()
return;
}
#ifdef HAVE_TERMIOS_H
if (pipe(m_should_exit_pipe) != 0) {
if (pipe(m_event_pipe) != 0) {
log_msg(LOG_LEVEL_ERROR, "[key control] Cannot create control pipe!\n");
return;
}
@@ -168,21 +167,21 @@ void keyboard_control::stop()
if (!m_started) {
return;
}
#ifdef HAVE_TERMIOS_H
char c = 0;
assert(write(m_should_exit_pipe[1], &c, 1) == 1);
close(m_should_exit_pipe[1]);
#else
unique_lock<mutex> lk(m_lock);
m_should_exit = true;
lk.unlock();
#ifdef HAVE_TERMIOS_H
char c = 0;
assert(write(m_event_pipe[1], &c, 1) == 1);
close(m_event_pipe[1]);
#else
m_cv.notify_one();
#endif
m_keyboard_thread.join();
m_started = false;
#ifdef HAVE_TERMIOS_H
close(m_should_exit_pipe[0]);
close(m_event_pipe[0]);
#endif
}
@@ -345,8 +344,8 @@ void keyboard_control::run()
fd_set set;
FD_ZERO(&set);
FD_SET(0, &set);
FD_SET(m_should_exit_pipe[0], &set);
select(m_should_exit_pipe[0] + 1, &set, NULL, NULL, NULL);
FD_SET(m_event_pipe[0], &set);
select(m_event_pipe[0] + 1, &set, NULL, NULL, NULL);
if (FD_ISSET(0, &set)) {
#else
unique_lock<mutex> lk(m_lock);
@@ -521,10 +520,13 @@ void keyboard_control::run()
end_loop:
#ifdef HAVE_TERMIOS_H
if (FD_ISSET(m_should_exit_pipe[0], &set)) {
#else
if (m_should_exit) {
if (FD_ISSET(m_event_pipe[0], &set)) {
char c;
read(m_event_pipe[0], &c, 1);
}
#endif
lk.lock();
if (m_should_exit) {
break;
}
}

4
src/keyboard_control.h
View File

@@ -85,11 +85,11 @@ private:
std::thread m_keyboard_thread;
struct module *m_root;
#ifdef HAVE_TERMIOS_H
int m_should_exit_pipe[2];
int m_event_pipe[2];
#else
bool m_should_exit;
std::condition_variable m_cv;
#endif
bool m_should_exit;
bool m_started;
bool m_locked_against_changes;
std::time_t m_start_time;