fix merge conflicts with master

diff --cc gtk2_ardour/ardev_common.sh.in
Simple merge

diff --cc gtk2_ardour/ardour_ui.cc
index 81c15ead95faccdd02ac5bd0e1fcd2ddadfb841f,3543405cf068b412031be949b49d08bede7be767..6ec5dff8d1b6a39fc72e242085f946740fac2805
--- 1/gtk2_ardour/ardour_ui.cc
--- 2/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@@ -214,10 -213,8 +213,13 @@@ ARDOUR_UI::ARDOUR_UI (int *argcp, char 
        }
  
        ui_config = new UIConfiguration();
++
 +      ui_config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
 +      boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
 +      ui_config->map_parameters (pc);
 +
+       _audio_midi_setup = new EngineControl;
+ 
        editor = 0;
        mixer = 0;
        meterbridge = 0;

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/editor.cc
Simple merge

diff --cc gtk2_ardour/editor_drag.cc
index 92d009f531b5b516065c76c1d4ee15186d35680a,9c65892ebde46cdb2c140c194149756a712d3910..d9580c1eeb017f2b3689f0b4181ebabf75c13939
--- 1/gtk2_ardour/editor_drag.cc
--- 2/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@@ -2376,10 -2370,15 +2376,15 @@@ CursorDrag::fake_locate (framepos_t t
  
        Session* s = _editor->session ();
        if (s->timecode_transmission_suspended ()) {
 -              framepos_t const f = _editor->playhead_cursor->current_frame;
 +              framepos_t const f = _editor->playhead_cursor->current_frame ();
+               /* This is asynchronous so it will be sent "now"
+                */
                s->send_mmc_locate (f);
-               s->send_full_time_code (f);
-               s->send_song_position_pointer (f);
+               /* These are synchronous and will be sent during the next
+                  process cycle
+               */
+               s->queue_full_time_code ();
+               s->queue_song_position_pointer ();
        }
  
        show_verbose_cursor_time (t);

diff --cc gtk2_ardour/editor_videotimeline.cc
index 3f12c59179050d496d6d530bfab6538429e4debe,6f3317eabd7c09ddd507eb2456e5b376f7bffbc5..4bf8b047cbbbe7177ef82d7e5d8bb31fb698b2e2
--- 1/gtk2_ardour/editor_videotimeline.cc
--- 2/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@@ -125,7 -138,12 +125,8 @@@ Editor::export_video (
                                break;
                }
        }
-       ExportVideoDialog dialog (*this, _session);
-       dialog.run();
+       ExportVideoDialog dialog (_session, get_selection().time);
+       Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
++      (void) r; // keep gcc quiet
        dialog.hide();
 -#if 0
 -      if (r == Gtk::RESPONSE_ACCEPT) {
 -              ARDOUR_UI::instance()->popup_error(string_compose(_("Export Successful: %1"),dialog.get_exported_filename()));
 -      }
 -#endif
  }

diff --cc gtk2_ardour/gain_meter.cc
Simple merge

diff --cc gtk2_ardour/generic_pluginui.cc
Simple merge

diff --cc gtk2_ardour/level_meter.cc
Simple merge

diff --cc gtk2_ardour/rc_option_editor.cc
Simple merge

diff --cc gtk2_ardour/utils.cc
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

diff --cc libs/ardour/graph.cc
Simple merge

diff --cc libs/ardour/ltc_slave.cc
Simple merge

diff --cc libs/ardour/midi_diskstream.cc
Simple merge

diff --cc libs/ardour/region.cc
Simple merge

diff --cc libs/ardour/wscript
Simple merge

diff --cc wscript
Simple merge