fix merge with master

diff --combined gtk2_ardour/wscript
index f4cb37dfc369139421a1128c055a00e716030c13,b657e5fcd5306c77cce442f8c8d8c38d130bc363..fc40276fac22a44bf363aa180e8b51327ef32aa1
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -46,12 -46,22 +46,12 @@@ gtk2_ardour_sources = 
          'big_clock_window.cc',
          'bundle_manager.cc',
          'button_joiner.cc',
 -        'canvas-flag.cc',
 -        'canvas-hit.cc',
 -        'canvas-note-event.cc',
 -        'canvas-note.cc',
 -        'canvas_patch_change.cc',
 -        'canvas-simpleline.c',
 -        'canvas-simplerect.c',
 -        'canvas-sysex.cc',
 -        'canvas-waveview.c',
          'clock_group.cc',
          'configinfo.cc',
          'control_point.cc',
          'control_point_dialog.cc',
          'curvetest.cc',
          'debug.cc',
 -        'diamond.cc',
          'edit_note_dialog.cc',
          'editing.cc',
          'editor.cc',
@@@ -106,12 -116,12 +106,12 @@@
          'insert_time_dialog.cc',
          'interthread_progress_window.cc',
          'io_selector.cc',
 +        'hit.cc',
          'keyboard.cc',
          'keyeditor.cc',
          'latency_gui.cc',
          'led.cc',
          'level_meter.cc',
 -        'lineset.cc',
          'location_ui.cc',
          'main.cc',
          'main_clock.cc',
@@@ -146,8 -156,6 +146,8 @@@
          'nag.cc',
          'new_plugin_preset_dialog.cc',
          'normalize_dialog.cc',
 +        'note.cc',
 +        'note_base.cc',
          'note_player.cc',
          'nsm.cc',
          'nsmclient.cc',
@@@ -157,7 -165,6 +157,7 @@@
          'panner_editor.cc',
          'panner_interface.cc',
          'panner_ui.cc',
 +        'patch_change.cc',
          'piano_roll_header.cc',
          'pingback.cc',
          'playlist_selector.cc',
@@@ -202,6 -209,8 +202,6 @@@
          'session_option_editor.cc',
          'sfdb_ui.cc',
          'shuttle_control.cc',
 -        'simpleline.cc',
 -        'simplerect.cc',
          'splash.cc',
          'speaker_dialog.cc',
          'startup.cc',
@@@ -211,7 -220,6 +211,7 @@@
          'stereo_panner_editor.cc',
          'streamview.cc',
          'strip_silence_dialog.cc',
 +        'sys_ex.cc',
          'tape_region_view.cc',
          'tempo_dialog.cc',
          'tempo_lines.cc',
@@@ -230,6 -238,7 +230,6 @@@
          'version.cc',
          'visibility_group.cc',
          'volume_controller.cc',
 -        'waveview.cc',
          'window_manager.cc',
  # video-timeline related sources:
          'video_image_frame.cc',
@@@ -274,6 -283,10 +274,6 @@@ def configure(conf)
                        atleast_version='2.18')
      autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
                        atleast_version='2.18')
 -    autowaf.check_pkg(conf, 'libgnomecanvas-2.0',
 -                      uselib_store='GNOMECANVAS', atleast_version='2.30')
 -    autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6',
 -                      uselib_store='GNOMECANVASMM', atleast_version='2.16')
      autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
      autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False)
      autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG')
@@@ -365,17 -378,16 +365,16 @@@ def build(bld)
                  ../libs/fst/vstwin.c
                  ../vst/winmain.c
          '''
-         obj.uselib = 'ALSA'
          obj.use          = [ 'libpbd',
                               'libmidipp',
--                             'libtaglib',
                               'libardour',
                               'libardour_cp',
+                              'libtimecode',
+                              'libmidipp',
                               'libgtk2_ardour',
                               'libgtkmm2ext',
-                              'libtaglib',
 -                             'libtaglib']
 +                             'libcanvas'
 +                             ]
          obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
          obj.includes  = [ '../libs/fst', '.' ]
          obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
@@@ -395,29 -407,28 +394,30 @@@
          obj.source    = gtk2_ardour_sources
          obj.target = 'ardour-' + bld.env['VERSION']
          obj.includes = ['.']
+         obj.use      = [ 'libpbd',
+                          'libardour',
+                          'libardour_cp',
+                          'libtimecode',
+                          'libmidipp',
+                          'libgtk2_ardour',
+                          'libgtkmm2ext',
+                        ]
  
      # continue with setup of obj, which could be a shared library
      # or an executable.
  
      obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
- 
-     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL'
+     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
      obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
      obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
-     obj.use          = [ 'libpbd',
-                          'libmidipp',
-                          'ardour',
-                          'libardour_cp',
-                          'libgtkmm2ext',
-                          'libcanvas'
-                          ]
++
      if bld.is_defined('USE_EXTERNAL_LIBS'):
          obj.uselib += ' TAGLIB'
      else:
          obj.use.append('libtaglib')
      if sys.platform == 'darwin':
 -        obj.use += ' libappleutility'
 +        obj.uselib += ' AUDIOUNITS OSX GTKOSX'
 +        obj.use    += ' libappleutility'
      obj.defines     = [
          'PACKAGE="' + I18N_PACKAGE + '"',
          'VERSIONSTRING="' + bld.env['VERSION'] + '"',

diff --combined libs/backends/jack/jack_audiobackend.cc
index ccd80e2e84e6bbb84fadd5075dcbde14507e01d9,8df97a1e303e41589df44829cfbb5d397e8e50ad..df2fd3a11bf5c3760c111ce6bc894df1cc00fe4c
--- 1/libs/backends/jack/jack_audiobackend.cc
--- 2/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@@ -155,11 -155,11 +155,11 @@@ JACKAudioBackend::enumerate_devices () 
  }
  
  vector<float>
- JACKAudioBackend::available_sample_rates (const string& /*device*/) const
+ JACKAudioBackend::available_sample_rates (const string& device) const
  {
        vector<float> f;
        
-       if (available()) {
+       if (device == _target_device && available()) {
                f.push_back (sample_rate());
                return f;
        }
@@@ -183,11 -183,11 +183,11 @@@
  }
  
  vector<uint32_t>
- JACKAudioBackend::available_buffer_sizes (const string& /*device*/) const
+ JACKAudioBackend::available_buffer_sizes (const string& device) const
  {
        vector<uint32_t> s;
-       
-       if (available()) {
+               
+       if (device == _target_device && available()) {
                s.push_back (buffer_size());
                return s;
        }
@@@ -767,6 -767,9 +767,6 @@@ JACKAudioBackend::jack_sync_callback (j
        TransportState tstate;
  
        switch (state) {
 -      case JackTransportStopped:
 -              tstate = TransportStopped;
 -              break;
        case JackTransportRolling:
                tstate = TransportRolling;
                break;
@@@ -776,10 -779,6 +776,10 @@@
        case JackTransportStarting:
                tstate = TransportStarting;
                break;
 +      case JackTransportStopped:
 +      default:
 +              tstate = TransportStopped;
 +              break;
        }
  
        return engine.sync_callback (tstate, pos->frame);