add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / video_monitor.cc

diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 6ac5ad7f8b920900c15a2c781c6b66ae478cd254..3f69eea6e628dbd62e84f5d7fa9c044ad5d68f51 100644 (file)
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -143,7 +143,7 @@ VideoMonitor::open (std::string filename)
         * 0x20 : don't use jack-session
         * 0x40 : no jack-transport control play/pause/rewind
         */
-       process->write_to_stdin("set override 104\n");
+       process->write_to_stdin("set override 120\n");
        process->write_to_stdin("notify keyboard\n");
        process->write_to_stdin("notify settings\n");
        process->write_to_stdin("window letterbox on\n");
@@ -200,6 +200,7 @@ void
 VideoMonitor::send_cmd (int what, int param)
 {
        bool osd_update = false;
+       int prev_osdmode = osdmode;
        if (!is_started()) return;
        switch (what) {
                case 1:
@@ -209,17 +210,17 @@ VideoMonitor::send_cmd (int what, int param)
                case 2:
                        if (param) osdmode |= 2;
                        else osdmode &= ~2;
-                       osd_update = true;
+                       osd_update = (prev_osdmode != osdmode);
                        break;
                case 3:
                        if (param) osdmode |= 1;
                        else osdmode &= ~1;
-                       osd_update = true;
+                       osd_update = (prev_osdmode != osdmode);
                        break;
                case 4:
                        if (param) osdmode |= 8;
                        else osdmode &= ~8;
-                       osd_update = true;
+                       osd_update = (prev_osdmode != osdmode);
                        break;
                case 5:
                        if (param) process->write_to_stdin("window zoom on\n");
@@ -235,7 +236,7 @@ VideoMonitor::send_cmd (int what, int param)
                default:
                        break;
        }
-       if (osd_update >= 0) {
+       if (osd_update) {
                std::ostringstream osstream; osstream << "osd mode " << osdmode << "\n";
                process->write_to_stdin(osstream.str());
        }
@@ -252,31 +253,7 @@ VideoMonitor::forward_keyevent (unsigned int keyval)
 {
        Editor* ed = dynamic_cast<Editor*>(&PublicEditor::instance());
        if (!ed) return;
-
-       GdkDisplay  *display = gtk_widget_get_display (GTK_WIDGET(ed->gobj()));
-       GdkKeymap   *keymap  = gdk_keymap_get_for_display (display);
-       GdkKeymapKey *keymapkey = NULL;
-       gint n_keys;
-
-       if (!gdk_keymap_get_entries_for_keyval(keymap, keyval, &keymapkey, &n_keys)) return;
-       if (n_keys !=1) { g_free(keymapkey); return;}
-
-       GdkEventKey ev;
-       ev.type = GDK_KEY_PRESS;
-       ev.window = ed->get_window()->gobj();
-       ev.send_event = FALSE;
-       ev.time = 0;
-       ev.state = 0;
-       ev.keyval = keyval;
-       ev.length = 0;
-       ev.string = (gchar*) "";
-       ev.hardware_keycode = keymapkey[0].keycode;
-       ev.group = keymapkey[0].group;
-       g_free(keymapkey);
-
-       forward_key_press(&ev);
-       ev.type = GDK_KEY_RELEASE;
-       forward_key_press(&ev);
+       emulate_key_event(ed, keyval);
 }
 
 void
@@ -445,8 +422,9 @@ void
 VideoMonitor::save_session ()
 {
        if (!_session) { return; }
-       XMLNode* node = _session->extra_xml (X_("XJSettings"));
+       XMLNode* node = _session->extra_xml (X_("XJSettings"), true);
        if (!node) return;
+       node->remove_nodes_and_delete("XJSetting");
 
        for(XJSettings::const_iterator it = xjadeo_settings.begin(); it != xjadeo_settings.end(); ++it) {
          XMLNode* child = node->add_child (X_("XJSetting"));
@@ -473,16 +451,6 @@ VideoMonitor::set_session (ARDOUR::Session *s)
   }
 }
 
-void
-VideoMonitor::clear_session_state ()
-{
-       xjadeo_settings.clear();
-       if (!_session) { return; }
-       XMLNode* node = new XMLNode(X_("XJSettings"));
-       _session->add_extra_xml (*node);
-       _session->set_dirty ();
-}
-
 bool
 VideoMonitor::set_custom_setting (const std::string k, const std::string v)
 {
@@ -513,21 +481,23 @@ VideoMonitor::set_offset (ARDOUR::frameoffset_t offset)
        if (offset == NO_OFFSET ) { return; }
 
        framecnt_t video_frame_offset;
-       framecnt_t audio_frame_rate;
+       framecnt_t audio_sample_rate;
        if (_session->config.get_videotimeline_pullup()) {
-               audio_frame_rate = _session->frame_rate();
+               audio_sample_rate = _session->frame_rate();
        } else {
-               audio_frame_rate = _session->nominal_frame_rate();
+               audio_sample_rate = _session->nominal_frame_rate();
        }
 
        /* Note: pull-up/down are applied here: frame_rate() vs. nominal_frame_rate() */
        if (_session->config.get_use_video_file_fps()) {
-               video_frame_offset = floor(offset * fps / audio_frame_rate);
+               video_frame_offset = floor(offset * fps / audio_sample_rate);
        } else {
-               video_frame_offset = floor(offset * _session->timecode_frames_per_second() / audio_frame_rate);
+               video_frame_offset = floor(offset * _session->timecode_frames_per_second() / audio_sample_rate);
        }
 
-       // TODO remember if changed..
+       if (video_offset == video_frame_offset) { return; }
+       video_offset = video_frame_offset;
+
        std::ostringstream osstream1; osstream1 << -1 * video_frame_offset;
        process->write_to_stdin("set offset " + osstream1.str() + "\n");
 }
@@ -538,18 +508,18 @@ VideoMonitor::manual_seek (framepos_t when, bool /*force*/, ARDOUR::frameoffset_
        if (!is_started()) { return; }
        if (!_session) { return; }
        framecnt_t video_frame;
-       framecnt_t audio_frame_rate;
+       framecnt_t audio_sample_rate;
        if (_session->config.get_videotimeline_pullup()) {
-               audio_frame_rate = _session->frame_rate();
+               audio_sample_rate = _session->frame_rate();
        } else {
-               audio_frame_rate = _session->nominal_frame_rate();
+               audio_sample_rate = _session->nominal_frame_rate();
        }
 
        /* Note: pull-up/down are applied here: frame_rate() vs. nominal_frame_rate() */
        if (_session->config.get_use_video_file_fps()) {
-               video_frame = floor(when * fps / audio_frame_rate);
+               video_frame = floor(when * fps / audio_sample_rate);
        } else {
-               video_frame = floor(when * _session->timecode_frames_per_second() / audio_frame_rate);
+               video_frame = floor(when * _session->timecode_frames_per_second() / audio_sample_rate);
        }
        if (video_frame < 0 ) video_frame = 0;