From 2fd851eed1fedb7e27ac9134c4b9e7d9e2206d11 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 23 Feb 2008 18:59:05 +0000 Subject: Trim some unnecessary widgets. git-svn-id: http://svn.drobilla.net/lad/patchage@1160 a436a847-0d15-0410-975c-d299462d15a1 --- src/Patchage.cpp | 14 +-- src/Patchage.hpp | 4 - src/patchage.glade | 304 ++++++++++++++--------------------------------------- 3 files changed, 81 insertions(+), 241 deletions(-) (limited to 'src') diff --git a/src/Patchage.cpp b/src/Patchage.cpp index ec958a1..3d124a2 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -117,13 +117,9 @@ Patchage::Patchage(int argc, char** argv) , INIT_WIDGET(_messages_win) , INIT_WIDGET(_messages_clear_but) , INIT_WIDGET(_messages_close_but) - , INIT_WIDGET(_play_but) - , INIT_WIDGET(_rewind_but) , INIT_WIDGET(_sample_rate_label) , INIT_WIDGET(_status_text) - , INIT_WIDGET(_stop_but) , INIT_WIDGET(_toolbar) - , INIT_WIDGET(_toolbars_box) , INIT_WIDGET(_zoom_full_but) , INIT_WIDGET(_zoom_normal_but) { @@ -164,12 +160,6 @@ Patchage::Patchage(int argc, char** argv) _buffer_size_combo->signal_changed().connect( sigc::mem_fun(this, &Patchage::buffer_size_changed)); - _rewind_but->signal_clicked().connect( - sigc::mem_fun(_jack_driver, &JackDriver::rewind_transport)); - _play_but->signal_clicked().connect( - sigc::mem_fun(_jack_driver, &JackDriver::start_transport)); - _stop_but->signal_clicked().connect( - sigc::mem_fun(_jack_driver, &JackDriver::stop_transport)); _clear_load_but->signal_clicked().connect( sigc::mem_fun(this, &Patchage::clear_load)); _zoom_normal_but->signal_clicked().connect(sigc::bind( @@ -677,9 +667,9 @@ void Patchage::on_view_toolbar() { if (_menu_view_toolbar->get_active()) - _toolbars_box->show(); + _toolbar->show(); else - _toolbars_box->hide(); + _toolbar->hide(); } diff --git a/src/Patchage.hpp b/src/Patchage.hpp index c48fdd8..445de30 100644 --- a/src/Patchage.hpp +++ b/src/Patchage.hpp @@ -144,13 +144,9 @@ protected: Widget _messages_win; Widget _messages_clear_but; Widget _messages_close_but; - Widget _play_but; - Widget _rewind_but; Widget _sample_rate_label; Widget _status_text; - Widget _stop_but; Widget _toolbar; - Widget _toolbars_box; Widget _zoom_full_but; Widget _zoom_normal_but; }; diff --git a/src/patchage.glade b/src/patchage.glade index f76892a..9872708 100644 --- a/src/patchage.glade +++ b/src/patchage.glade @@ -352,42 +352,39 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_TOOLBAR_ICONS + False + GTK_ICON_SIZE_SMALL_TOOLBAR + True - + True - False - GTK_ICON_SIZE_SMALL_TOOLBAR - True + False - + True - False + 0 - + True - 0 - + True - - - True - Latency: - - - False - False - - - - - True - Jack latency - 1 - 32 frames + Latency: + + + False + False + + + + + True + Jack latency + 1 + 32 frames 64 frames 128 frames 256 frames @@ -395,185 +392,83 @@ 1024 frames 2048 frames 4096 frames - - - - - - - 1 - 1 - - - - - 48 - - - False - False - 1 - 2 - - - - - 1 - kHz + + - - False - False - 3 - + + 1 + 1 + - - - - - False - False - - - - - True - 8 - - - False - False - - - - - True - Clear the dropout indicator - gtk-clear - - - False - - - - - True - - - True - 0 - - True - Drouput (XRun) Indicator - -The bar represents the percentage of available time used for audio processing (i.e. the DSP load). If the bar reaches 100%, a dropout will occur. - 0.10000000149 - 0 Dropouts + + 48 + + + False + False + 1 + 2 + + + + + 1 + kHz + + False + False + 3 + - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - False + False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_TOOLBAR_BOTH - False + 8 - 1 + False + False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - GTK_ICON_SIZE_SMALL_TOOLBAR - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Zoom to normal size - gtk-zoom-100 - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Zoom to fit all modules - gtk-zoom-fit - - - False - - + Clear the dropout indicator + gtk-clear False - 2 - - - False - 1 - - - - - + True - + True - True - Rewind Jack transport - 0 + 0 - + True - gtk-media-previous + Drouput (XRun) Indicator + +The bar represents the percentage of available time used for audio processing (i.e. the DSP load). If the bar reaches 100%, a dropout will occur. + 0.10000000149 + 0 Dropouts @@ -585,89 +480,48 @@ The bar represents the percentage of available time used for audio processing (i - + True - - - True - True - Start Jack transport - 1 - 0 - - - True - gtk-media-play - - - - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False - False False - + True - - - True - True - 1 - 0 - - - True - Pause Jack transport - gtk-media-pause - - - - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False - False - + True - 1 - - - True - False - True - Jack transport time - False - * - 11 - 00:00:00.000 - - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-zoom-100 False - False - + True - 4 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-zoom-fit False - False False - 2 + 1 @@ -685,7 +539,7 @@ The bar represents the percentage of available time used for audio processing (i - 3 + 2 -- cgit v1.2.1