From d67cad98ea2ecc27b58bb615db4ec4a390a3f7fe Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 7 Jun 2017 15:06:12 +0200 Subject: [PATCH] Keyboard control: show info also when pressing 'i' --- src/keyboard_control.cpp | 37 +++++++++++++++++++++++-------------- src/keyboard_control.h | 1 + 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/keyboard_control.cpp b/src/keyboard_control.cpp index 3ab6d7ec4..a0c8c04e6 100644 --- a/src/keyboard_control.cpp +++ b/src/keyboard_control.cpp @@ -211,6 +211,9 @@ void keyboard_control::run() case 'h': usage(); break; + case 'i': + info(); + break; case '\n': cout << endl; break; @@ -276,21 +279,8 @@ after_protected: } } - -void keyboard_control::usage() +void keyboard_control::info() { - cout << "\nAvailable keybindings:\n" << - "\t * 0 - increase volume\n" << - "\t / 9 - decrease volume\n" << - "\t + - increase audio delay by 10 ms\n" << - "\t - - decrease audio delay by 10 ms\n" << - "\t m - mute/unmute\n" << - "\t v - increase verbosity level\n" << - "\t e - record captured content (toggle)\n" << - "\t h - show help\n" << - "\tCtrl-x - unlock/lock against changes\n" << - "\tCtrl-c - exit\n" << - "\n"; cout << "Verbosity level: " << log_level << (log_level == LOG_LEVEL_INFO ? " (default)" : "") << "\n"; cout << "Locked against changes: " << (m_locked_against_changes ? "true" : "false") << "\n"; cout << "Audio playback delay: " << get_audio_delay() << " ms\n"; @@ -363,3 +353,22 @@ void keyboard_control::usage() cout << "\n"; } +void keyboard_control::usage() +{ + cout << "\nAvailable keybindings:\n" << + "\t * 0 - increase volume\n" << + "\t / 9 - decrease volume\n" << + "\t + - increase audio delay by 10 ms\n" << + "\t - - decrease audio delay by 10 ms\n" << + "\t m - mute/unmute\n" << + "\t v - increase verbosity level\n" << + "\t e - record captured content (toggle)\n" << + "\t h - show help\n" << + "\t i - show various information\n" << + "\tCtrl-x - unlock/lock against changes\n" << + "\tCtrl-c - exit\n" << + "\n"; + + info(); +} + diff --git a/src/keyboard_control.h b/src/keyboard_control.h index 73d498ae3..61f78ad11 100644 --- a/src/keyboard_control.h +++ b/src/keyboard_control.h @@ -52,6 +52,7 @@ public: void start(struct module *root); void stop(); void run(); + void info(); void usage(); private: