LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove lash status control and monitor stuff from gladish. It is not supposed to be usable without ladish.

This commit is contained in:
Nedko Arnaudov 2009-07-21 01:38:37 +03:00
parent 4cf6b9dd63
commit d1856e0a34
3 changed files with 0 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gui/Patchage.cpp
View File

@ -91,15 +91,12 @@ Patchage::Patchage(int argc, char** argv)
, INIT_WIDGET(_main_win)
, INIT_WIDGET(_main_xrun_progress)
, INIT_WIDGET(_main_a2j_status_label)
, INIT_WIDGET(_main_lash_status_label)
, INIT_WIDGET(_menu_file_quit)
, INIT_WIDGET(_menu_help_about)
, INIT_WIDGET(_menu_jack_start)
, INIT_WIDGET(_menu_jack_stop)
, INIT_WIDGET(_menu_a2j_start)
, INIT_WIDGET(_menu_a2j_stop)
, INIT_WIDGET(_menu_lash_activate)
, INIT_WIDGET(_menu_lash_deactivate)
, INIT_WIDGET(_menu_load_project)
, INIT_WIDGET(_menu_save_all_projects)
, INIT_WIDGET(_menu_close_all_projects)
@ -232,11 +229,6 @@ Patchage::Patchage(int argc, char** argv)
_menu_a2j_stop->signal_activate().connect(
sigc::mem_fun(_a2j, &a2j_proxy::stop_bridge));
_menu_lash_activate->signal_activate().connect(
sigc::mem_fun(_lash, &lash_proxy::try_activate));
_menu_lash_deactivate->signal_activate().connect(
sigc::mem_fun(_lash, &lash_proxy::deactivate));
jack_status_changed(_jack->is_started());
connect_widgets();
@ -567,19 +559,6 @@ Patchage::set_lash_availability(
{
_project_list->set_lash_availability(lash_active);
_menu_view_projects->set_active(lash_active);
_menu_lash_activate->set_sensitive(!lash_active);
_menu_lash_deactivate->set_sensitive(lash_active);
if (!lash_active)
{
_session->clear();
_main_lash_status_label->set_text("LASH N/A");
_project_list_viewport->hide();
}
else
{
_main_lash_status_label->set_text("LASH active");
_project_list_viewport->show();
}
}
void

3
gui/Patchage.hpp
View File

@ -160,15 +160,12 @@ protected:
Widget<Gtk::Window> _main_win;
Widget<Gtk::ProgressBar> _main_xrun_progress;
Widget<Gtk::Label> _main_a2j_status_label;
Widget<Gtk::Label> _main_lash_status_label;
Widget<Gtk::MenuItem> _menu_file_quit;
Widget<Gtk::MenuItem> _menu_help_about;
Widget<Gtk::MenuItem> _menu_jack_start;
Widget<Gtk::MenuItem> _menu_jack_stop;
Widget<Gtk::MenuItem> _menu_a2j_start;
Widget<Gtk::MenuItem> _menu_a2j_stop;
Widget<Gtk::MenuItem> _menu_lash_activate;
Widget<Gtk::MenuItem> _menu_lash_deactivate;
Widget<Gtk::MenuItem> _menu_load_project;
Widget<Gtk::MenuItem> _menu_save_all_projects;
Widget<Gtk::MenuItem> _menu_close_all_projects;

58
gui/gui.glade
View File

@ -175,38 +175,6 @@
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_lash_activate">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label" translatable="yes">Activate LASH</property>
<property name="use_underline">True</property>
<accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="menu-item-image15">
<property name="visible">True</property>
<property name="stock">gtk-media-play</property>
<property name="icon_size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_lash_deactivate">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="label" translatable="yes">Deactivate LASH</property>
<property name="use_underline">True</property>
<accelerator key="L" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="menu-item-image16">
<property name="visible">True</property>
<property name="stock">gtk-media-stop</property>
<property name="icon_size">1</property>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
@ -484,32 +452,6 @@ The bar represents the percentage of available time used for audio processing (i
<property name="homogeneous">False</property>
</packing>
</child>
<child>
<widget class="GtkToolItem" id="toolitem_lash">
<property name="visible">True</property>
<property name="border_width">1</property>
<child>
<widget class="GtkViewport" id="viewport3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="resize_mode">GTK_RESIZE_QUEUE</property>
<child>
<widget class="GtkLabel" id="main_lash_status_label">
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">LASH status?</property>
<property name="use_markup">True</property>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</property>
</packing>
</child>
<child>
<widget class="GtkSeparatorToolItem" id="toolbutton2">
<property name="visible">True</property>