stop audio clocks from vanishing when turned off

git-svn-id: svn://localhost/ardour2/trunk@2149 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 5359bae1cb85e7ac8781303cd1b6b569a7a16beb..7a2606114c43dead8c74560f46dc0cda2e76d2ec 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1872,16 +1872,8 @@ AudioClock::set_mode (Mode m)
        if (_mode == m) {
                return;
        }
-       switch (_mode) {
-       case SMPTE:
-       case BBT:
-       case MinSec:
-       case Frames:
-               clock_base.remove ();
-               break;
-       case Off:
-               break;
-       }
+       
+       clock_base.remove ();
        
        _mode = m;
 
@@ -1903,6 +1895,7 @@ AudioClock::set_mode (Mode m)
                break;
 
        case Off:
+               clock_base.add (off_hbox);
                break;
        }
 
@@ -1947,6 +1940,7 @@ AudioClock::set_size_requests ()
                break;
 
        case Off:
+               Gtkmm2ext::set_size_request_to_display_given_text (off_hbox, "00000", 5, 5);
                break;
                
        }

diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 16156625c880a0829288014daebf58f7fa689d7a..21a2755588704770b48cab1b599ab28474a62be2 100644 (file)
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -104,6 +104,8 @@ class AudioClock : public Gtk::HBox
        Gtk::EventBox  audio_frames_ebox;
        Gtk::Label     audio_frames_label;
 
+       Gtk::HBox      off_hbox;
+
        Gtk::EventBox  hours_ebox;
        Gtk::EventBox  minutes_ebox;
        Gtk::EventBox  seconds_ebox;