Vorbis Quality Config GUI

[ardour.git] / gtk2_ardour / ardour_ui2.cc

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index ef0c8fffcddd9dc1f589506bb9091463db15a1fa..f791259af75645174f664e8034b2539cc7c3ff03 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -109,36 +109,21 @@ ARDOUR_UI::status_bar_button_press (GdkEventButton* ev)
 }
 
 void
-ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
+ARDOUR_UI::display_message (const char* prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char* msg)
 {
-       string text;
-
        UI::display_message (prefix, prefix_len, ptag, mtag, msg);
 
        ArdourLogLevel ll = LogLevelNone;
 
        if (strcmp (prefix, _("[ERROR]: ")) == 0) {
-               text = "<span color=\"red\" weight=\"bold\">";
                ll = LogLevelError;
        } else if (strcmp (prefix, _("[WARNING]: ")) == 0) {
-               text = "<span color=\"yellow\" weight=\"bold\">";
                ll = LogLevelWarning;
        } else if (strcmp (prefix, _("[INFO]: ")) == 0) {
-               text = "<span color=\"green\" weight=\"bold\">";
                ll = LogLevelInfo;
-       } else {
-               text = "<span color=\"white\" weight=\"bold\">???";
        }
 
        _log_not_acknowledged = std::max(_log_not_acknowledged, ll);
-
-#ifdef TOP_MENUBAR
-       text += prefix;
-       text += "</span>";
-       text += msg;
-
-       status_bar_label.set_markup (text);
-#endif
 }
 
 XMLNode*
@@ -190,33 +175,22 @@ ARDOUR_UI::repack_transport_hbox ()
                mini_timeline.show();
        }
 
-       if (dsp_load_indicator.get_parent()) {
-               transport_hbox.remove (dsp_load_indicator);
-       }
-       if (UIConfiguration::instance().get_show_dsp_load_info ()) {
-               transport_hbox.pack_start (dsp_load_indicator, false, false);
-               dsp_load_indicator.show();
-       }
-
-       if (disk_space_indicator.get_parent()) {
-               transport_hbox.remove (disk_space_indicator);
-       }
-       if (UIConfiguration::instance().get_show_disk_space_info ()) {
-               transport_hbox.pack_start (disk_space_indicator, false, false);
-               disk_space_indicator.show();
-       }
-
        if (editor_meter) {
-               if (meter_box.get_parent()) {
-                       transport_hbox.remove (meter_box);
-                       transport_hbox.remove (editor_meter_peak_display);
+               if (editor_meter_table.get_parent()) {
+                       transport_hbox.remove (editor_meter_table);
+               }
+               if (meterbox_spacer.get_parent()) {
+                       transport_hbox.remove (meterbox_spacer);
+                       transport_hbox.remove (meterbox_spacer2);
                }
 
                if (UIConfiguration::instance().get_show_editor_meter()) {
-                       transport_hbox.pack_end (editor_meter_peak_display, false, false);
-                       transport_hbox.pack_end (meter_box, false, false);
-                       meter_box.show();
-                       editor_meter_peak_display.show();
+                       transport_hbox.pack_end (meterbox_spacer, false, false, 3);
+                       transport_hbox.pack_end (editor_meter_table, false, false);
+                       transport_hbox.pack_end (meterbox_spacer2, false, false, 3);
+                       editor_meter_table.show();
+                       meterbox_spacer.show();
+                       meterbox_spacer2.show();
                }
        }
 
@@ -418,7 +392,7 @@ ARDOUR_UI::setup_transport ()
        /* top level packing */
        transport_table.set_spacings (0);
        transport_table.set_row_spacings (4);
-       transport_table.set_border_width (2);
+       transport_table.set_border_width (0);
 
        transport_frame.set_name ("TransportFrame");
        transport_frame.set_shadow_type (Gtk::SHADOW_NONE);
@@ -553,9 +527,6 @@ ARDOUR_UI::setup_transport ()
        transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, hpadding, 0);
        ++col;
 
-       transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
-       ++col;
-
        /* editor-meter, mini-timeline and selection clock are options in the transport_hbox */
        transport_hbox.set_spacing (3);
        transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, hpadding, 0);