update to hydrogen 0.9.6-beta3. changes include:

Bugfixes:
- Major fixes for the pattern handling in the soundlibrary
- A memory leak was fixed which appeared when using note-off notes
- A note-off related segmentation fault was fixed
- The path of instrumens is now set correctly if a song gets saved
(solves the abs. vs. rel. path problem)
- lots of smaller fixes..

New features:
- New midi action: SELECT_NEXT_PATTERN_RELATIVE
- Show a layers velocity informations in a tooltip
- Added a description field for patterns
- Jack session support
- Jack midi out
- Undo history
- Tabbed interface (aimed at netbooks)
- CMake for build

7 files changed, 145 insertions, 108 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 99a5484ae63..eefce8cd5b4 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2014/02/12 23:17:33 tron Exp $
+# $NetBSD: Makefile,v 1.42 2014/03/06 10:16:15 mrg Exp $
 
-DISTNAME=	hydrogen-0.9.5.1
-PKGREVISION=	8
+DISTNAME=	hydrogen-0.9.6-beta3
+PKGNAME=	hydrogen-0.9.6.beta3
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
+MASTER_SITES=	https://github.com/hydrogen-music/hydrogen/archive/
 
 MAINTAINER=	mrg@eterna.com.au
 HOMEPAGE=	http://www.hydrogen-music.org/
@@ -13,27 +13,22 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
-BUILD_DEPENDS+=		scons>=0.98:../../devel/scons
-BUILD_DEPENDS+=		subversion-base>=1.0:../../devel/subversion-base
-
 MAKE_ENV+=	QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin
-SCONS_ARGS=	libarchive=1 jack=0 lrdf=0 QTDIR=${QTDIR}
+
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DWANT_OSS=ON
+CMAKE_ARGS+=	-DWANT_LIBARCHIVE=ON
+CMAKE_ARGS+=	-DWANT_JACK=OFF
+CMAKE_ARGS+=	-DWANT_LRDF=OFF
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
-SCONS_ARGS+=	alsa=1
+CMAKE_ARGS+=	-DWANT_ALSA=ON
 .else
-SCONS_ARGS+=	alsa=0
+CMAKE_ARGS+=	-DWANT_ALSA=OFF
 .endif
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons DESTDIR=${DESTDIR} prefix=${PREFIX} ${SCONS_ARGS}
-
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons DESTDIR=${DESTDIR} prefix=${PREFIX} ${SCONS_ARGS} install
-
-
 .include "../../archivers/libarchive/buildlink3.mk"
 .if ${OPSYS} == "Linux"
 .  include "../../audio/alsa-lib/buildlink3.mk"
diff --git a/audio/hydrogen/PLIST b/audio/hydrogen/PLIST
index c3fe8b32ee9..cf3e1b003c0 100644
--- a/audio/hydrogen/PLIST
+++ b/audio/hydrogen/PLIST
@@ -1,5 +1,54 @@
-@comment $NetBSD: PLIST,v 1.5 2013/01/11 13:23:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/03/06 10:16:15 mrg Exp $
+bin/h2cli
+bin/h2player
+bin/h2synth
 bin/hydrogen
+include/hydrogen/IO/AudioOutput.h
+include/hydrogen/IO/CoreMidiDriver.h
+include/hydrogen/IO/JackOutput.h
+include/hydrogen/IO/MidiCommon.h
+include/hydrogen/IO/MidiInput.h
+include/hydrogen/IO/MidiOutput.h
+include/hydrogen/IO/NullDriver.h
+include/hydrogen/IO/TransportInfo.h
+include/hydrogen/LashClient.h
+include/hydrogen/LocalFileMng.h
+include/hydrogen/Preferences.h
+include/hydrogen/audio_engine.h
+include/hydrogen/basics/adsr.h
+include/hydrogen/basics/drumkit.h
+include/hydrogen/basics/instrument.h
+include/hydrogen/basics/instrument_layer.h
+include/hydrogen/basics/instrument_list.h
+include/hydrogen/basics/note.h
+include/hydrogen/basics/pattern.h
+include/hydrogen/basics/pattern_list.h
+include/hydrogen/basics/sample.h
+include/hydrogen/basics/song.h
+include/hydrogen/config.h
+include/hydrogen/event_queue.h
+include/hydrogen/fx/Effects.h
+include/hydrogen/fx/LadspaFX.h
+include/hydrogen/fx/ladspa.h
+include/hydrogen/globals.h
+include/hydrogen/h2_exception.h
+include/hydrogen/helpers/filesystem.h
+include/hydrogen/helpers/legacy.h
+include/hydrogen/helpers/xml.h
+include/hydrogen/hydrogen.h
+include/hydrogen/logger.h
+include/hydrogen/midi_action.h
+include/hydrogen/midi_map.h
+include/hydrogen/object.h
+include/hydrogen/playlist.h
+include/hydrogen/rt_clock.h
+include/hydrogen/sampler/Sampler.h
+include/hydrogen/smf/SMF.h
+include/hydrogen/smf/SMFEvent.h
+include/hydrogen/synth/Synth.h
+include/hydrogen/timehelper.h
+include/hydrogen/version.h
+lib/libhydrogen-core-0.9.6.so
 share/applications/hydrogen.desktop
 share/hydrogen/data/DefaultSong.h2song
 share/hydrogen/data/click.wav
@@ -11,6 +60,7 @@ share/hydrogen/data/demo_songs/GM_kit_demo3.h2song
 share/hydrogen/data/demo_songs/TR808kit-demo.h2song
 share/hydrogen/data/demo_songs/tutorial_georgyporgy.h2song
 share/hydrogen/data/doc/Makefile
+share/hydrogen/data/doc/MidiInstrumentMapping.ods
 share/hydrogen/data/doc/README.DOCUMENTATION.txt
 share/hydrogen/data/doc/img/AudioEngineInfoDialog.png
 share/hydrogen/data/doc/img/CreateNewPattern.png
@@ -20,9 +70,10 @@ share/hydrogen/data/doc/img/DrumkitExport.png
 share/hydrogen/data/doc/img/DrumkitImport.png
 share/hydrogen/data/doc/img/DrumkitLoad.png
 share/hydrogen/data/doc/img/DrumkitSave.png
+share/hydrogen/data/doc/img/Export_song.png
 share/hydrogen/data/doc/img/FX_send_knobs.png
-share/hydrogen/data/doc/img/GUI_Sections.svg
 share/hydrogen/data/doc/img/GUI_Sections_0.9.5.png
+share/hydrogen/data/doc/img/GUI_Sections_0.9.5_v2.png
 share/hydrogen/data/doc/img/HearNewNotes.png
 share/hydrogen/data/doc/img/Hydrogen_0.9.5_gui.png
 share/hydrogen/data/doc/img/InstrumentMapping.png
@@ -38,6 +89,7 @@ share/hydrogen/data/doc/img/MainRecord.png
 share/hydrogen/data/doc/img/MainStop.png
 share/hydrogen/data/doc/img/MainToolbar.png
 share/hydrogen/data/doc/img/MainToolbar_V2.png
+share/hydrogen/data/doc/img/MainUI_tabbed.png
 share/hydrogen/data/doc/img/MeasureSettings.png
 share/hydrogen/data/doc/img/MidiIN_CPU.png
 share/hydrogen/data/doc/img/Midi_Actions.png
@@ -71,10 +123,12 @@ share/hydrogen/data/doc/img/PatternEditorSizeRes.png
 share/hydrogen/data/doc/img/PatternEditor_DrumMode.png
 share/hydrogen/data/doc/img/PatternEditor_PianoMode.png
 share/hydrogen/data/doc/img/PreferencesAppearance.png
+share/hydrogen/data/doc/img/PreferencesAppearance_V2.png
 share/hydrogen/data/doc/img/PreferencesAudioSystem.png
 share/hydrogen/data/doc/img/PreferencesAudioSystem_V2.png
 share/hydrogen/data/doc/img/PreferencesGeneral.png
 share/hydrogen/data/doc/img/PreferencesGeneral_V2.png
+share/hydrogen/data/doc/img/PreferencesGeneral_V3.png
 share/hydrogen/data/doc/img/PreferencesMidiSystem.png
 share/hydrogen/data/doc/img/PreferencesMidiSystem_V2.png
 share/hydrogen/data/doc/img/Rec_button.png
@@ -93,7 +147,6 @@ share/hydrogen/data/doc/img/SongLoop.png
 share/hydrogen/data/doc/img/SongOperations.png
 share/hydrogen/data/doc/img/SoundLibrary.png
 share/hydrogen/data/doc/img/Sound_Library_import.png
-share/hydrogen/data/doc/img/SoundlibraryHierarchy.svg
 share/hydrogen/data/doc/img/SoundlibraryHierarchy_V3.png
 share/hydrogen/data/doc/img/SoundlibraryHierarchy_V4.png
 share/hydrogen/data/doc/img/Tutorial2.h2song
@@ -175,6 +228,7 @@ share/hydrogen/data/doc/img/screenshot-director.png
 share/hydrogen/data/doc/img/showFX_on.png
 share/hydrogen/data/doc/img/showPeaks_on.png
 share/hydrogen/data/doc/img/songFuncBtn_on.png
+share/hydrogen/data/doc/img/stacked_mode_V3.png
 share/hydrogen/data/doc/img/tag_bar.png
 share/hydrogen/data/doc/img/tastiera.png
 share/hydrogen/data/doc/img/tempo_bar.png
@@ -212,9 +266,6 @@ share/hydrogen/data/doc/manual_nl.po
 share/hydrogen/data/doc/tutorial.docbook
 share/hydrogen/data/doc/tutorial.pot
 share/hydrogen/data/doc/tutorial_en.html
-share/hydrogen/data/doc/tutorial_es.docbook
-share/hydrogen/data/doc/tutorial_es.html
-share/hydrogen/data/doc/tutorial_es.po
 share/hydrogen/data/doc/tutorial_fr.html
 share/hydrogen/data/doc/tutorial_fr.po
 share/hydrogen/data/doc/tutorial_it.html
@@ -286,6 +337,8 @@ share/hydrogen/data/i18n/hydrogen.ru.qm
 share/hydrogen/data/i18n/hydrogen.ru.ts
 share/hydrogen/data/i18n/hydrogen.sv.qm
 share/hydrogen/data/i18n/hydrogen.sv.ts
+share/hydrogen/data/i18n/stats.py
+share/hydrogen/data/i18n/updateTranslations.sh
 share/hydrogen/data/img/gray/about/aboutLogo.png
 share/hydrogen/data/img/gray/audiFileBrowser/go-home.png
 share/hydrogen/data/img/gray/audiFileBrowser/go-up.png
@@ -305,6 +358,7 @@ share/hydrogen/data/img/gray/drumkitManager/btn_save_off.png
 share/hydrogen/data/img/gray/drumkitManager/btn_save_on.png
 share/hydrogen/data/img/gray/drumkitManager/btn_save_over.png
 share/hydrogen/data/img/gray/h2-icon.svg
+share/hydrogen/data/img/gray/icon.icns
 share/hydrogen/data/img/gray/icon.svg
 share/hydrogen/data/img/gray/icon16.png
 share/hydrogen/data/img/gray/icon24.png
@@ -409,6 +463,8 @@ share/hydrogen/data/img/gray/patternEditor/background_zoom.png
 share/hydrogen/data/img/gray/patternEditor/btn_dropdown_off.png
 share/hydrogen/data/img/gray/patternEditor/btn_dropdown_on.png
 share/hydrogen/data/img/gray/patternEditor/btn_dropdown_over.png
+share/hydrogen/data/img/gray/patternEditor/btn_drum_piano_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_drum_piano_on.png
 share/hydrogen/data/img/gray/patternEditor/btn_hear_off.png
 share/hydrogen/data/img/gray/patternEditor/btn_hear_on.png
 share/hydrogen/data/img/gray/patternEditor/btn_mute_off.png
@@ -502,9 +558,11 @@ share/hydrogen/data/img/gray/playerControlPanel/metronome_up.png
 share/hydrogen/data/img/gray/playerControlPanel/midiActivity_back.png
 share/hydrogen/data/img/gray/playerControlPanel/midiActivity_on.png
 share/hydrogen/data/img/gray/playerControlPanel/onoff.png
+share/hydrogen/data/img/gray/playerControlPanel/pattern_mode.png
 share/hydrogen/data/img/gray/playerControlPanel/playlist_background_Control.png
 share/hydrogen/data/img/gray/playerControlPanel/rubber_off.png
 share/hydrogen/data/img/gray/playerControlPanel/rubber_on.png
+share/hydrogen/data/img/gray/playerControlPanel/song_mode.png
 share/hydrogen/data/img/gray/playerControlPanel/statusLED_off.png
 share/hydrogen/data/img/gray/playerControlPanel/statusLED_on.png
 share/hydrogen/data/img/gray/preferencesDialog/rec.png
@@ -553,6 +611,20 @@ share/hydrogen/data/img/gray/waveDisplay/bgsamplewavedisplay.png
 share/hydrogen/data/img/gray/waveDisplay/detailsamplewavedisplay.png
 share/hydrogen/data/img/gray/waveDisplay/mainsamplewavedisplay.png
 share/hydrogen/data/img/gray/waveDisplay/targetsamplewavedisplay.png
-share/pixmaps/h2-icon.svg
-@pkgdir share/hydrogen/data/doc/man/ru
-@pkgdir share/hydrogen/data/doc/man/C
+share/hydrogen/data/new_tutorial/img_tutorial/Bridge1_4th.png
+share/hydrogen/data/new_tutorial/img_tutorial/Bridge3_3a_hh.png
+share/hydrogen/data/new_tutorial/img_tutorial/C3_6+7.png
+share/hydrogen/data/new_tutorial/img_tutorial/Intro4th.png
+share/hydrogen/data/new_tutorial/img_tutorial/PatternBase1.png
+share/hydrogen/data/new_tutorial/img_tutorial/PatternBase2.png
+share/hydrogen/data/new_tutorial/img_tutorial/Riff1b.png
+share/hydrogen/data/new_tutorial/img_tutorial/Riff1c.png
+share/hydrogen/data/new_tutorial/img_tutorial/Riff1d.png
+share/hydrogen/data/new_tutorial/img_tutorial/Verse8th.png
+share/hydrogen/data/new_tutorial/img_tutorial/VerseAll.png
+share/hydrogen/data/new_tutorial/img_tutorial/VerseBridge.png
+share/hydrogen/data/new_tutorial/img_tutorial/VerseBridge_hh.png
+share/hydrogen/data/new_tutorial/img_tutorial/warn.png
+share/hydrogen/data/new_tutorial/tutorial_en.html
+share/hydrogen/data/xsd/drumkit.xsd
+share/hydrogen/data/xsd/drumkit_pattern.xsd
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index e0e1f46e18d..f9f55e6400b 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2013/01/11 13:23:33 joerg Exp $
+$NetBSD: distinfo,v 1.8 2014/03/06 10:16:15 mrg Exp $
 
-SHA1 (hydrogen-0.9.5.1.tar.gz) = f389fdb853c77718c45141f6a895c06acdcbd2be
-RMD160 (hydrogen-0.9.5.1.tar.gz) = 2bf6280a07e4e45643815376ad94b35146ace772
-Size (hydrogen-0.9.5.1.tar.gz) = 5515314 bytes
-SHA1 (patch-aa) = 9151230f859889fcba3335d86e283c5ff2f8cd6c
-SHA1 (patch-ab) = b532ec96fbc9ff796f9b1facd7ba38a1d9c9361f
+SHA1 (hydrogen-0.9.6-beta3.tar.gz) = 9d1f0b58e62ad5e14ca9ee9d2f38d68d2c1a2585
+RMD160 (hydrogen-0.9.6-beta3.tar.gz) = ecfd94480a5a1e70e587e242dea8e159f4bb0bbd
+Size (hydrogen-0.9.6-beta3.tar.gz) = 6217398 bytes
+SHA1 (patch-CMakeLists.txt) = 4557bc8c3fab79f1fc472b368655cecdda4bf12c
+SHA1 (patch-src_gui_src_PlayerControl.cpp) = 803dc5ee27f5e3f0124ab876116bbc1d0388d902
diff --git a/audio/hydrogen/patches/patch-CMakeLists.txt b/audio/hydrogen/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..8fc598e30ec
--- /dev/null
+++ b/audio/hydrogen/patches/patch-CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2014/03/06 10:16:15 mrg Exp $
+
+look for -lossaudio on NetBSD.
+
+--- CMakeLists.txt.orig	2013-02-21 10:53:51.000000000 -0800
++++ CMakeLists.txt	2014-03-05 23:19:14.000000000 -0800
+@@ -53,7 +53,11 @@
+ 	OPTION(WANT_JACKSESSION "Enable use of Jack-Session-Handler" ON)
+ ENDIF()
+ 
+-OPTION(WANT_OSS          "Include OSS (Open Sound System) support" OFF)
++IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
++	OPTION(WANT_OSS          "Include OSS (Open Sound System) support" ON)
++ELSE()
++	OPTION(WANT_OSS          "Include OSS (Open Sound System) support" OFF)
++ENDIF()
+ OPTION(WANT_ALSA         "Include ALSA (Advanced Linux Sound Architecture) support" ON)
+ OPTION(WANT_JACK         "Include JACK (Jack Audio Connection Kit) support" ON)
+ OPTION(WANT_PORTAUDIO    "Include PortAudio support" OFF)
+@@ -159,7 +163,11 @@
+ FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
+ FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
+ FIND_LADSPA(LADSPA ladspa.h noise)
+-FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
++IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
++    FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
++ELSE()
++    FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
++ENDIF()
+ FIND_HELPER(JACK jack jack/jack.h jack)
+ FIND_HELPER(JACKSESSION jack jack/session.h jack)
+ IF(APPLE)
diff --git a/audio/hydrogen/patches/patch-aa b/audio/hydrogen/patches/patch-aa
deleted file mode 100644
index 8fa1bdb9c83..00000000000
--- a/audio/hydrogen/patches/patch-aa
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2013/01/11 13:23:33 joerg Exp $
-
---- Sconstruct.orig	2012-02-19 21:54:05.000000000 +0000
-+++ Sconstruct
-@@ -47,7 +47,7 @@ def get_platform_flags( opts ):
- 
- 	env = Environment( options = opts )
- 
--	if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin":
-+	if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin" or sys.platform[:6] == "netbsd":
- 		if str(env['debug']) == "1":
- 			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
- 			for flag in env["optflags"].split(" "):
-@@ -75,6 +75,12 @@ def get_platform_flags( opts ):
- 		    if str(env['bundle']) == "1": cppflags.append('-DBUNDLE_SUPPORT')
- 
- 		cppflags.append('-DLADSPA_SUPPORT')
-+
-+		includes.append( env['prefix'] + "/include" )
-+		ldflags.append( "-L" + env['prefix'] + "/lib" )
-+		ldflags.append( "-Wl,-R," + env['prefix'] + "/lib" )
-+		# XXX: this should go in py4.py but i'm not sure where
-+		ldflags.append( "-Wl,-R," + env['prefix'] + "/qt4/lib" )
- 		
- 
- 	if str(env['gui']) == "0": cppflags.append('-DNO_GUI_SUPPORT')
-@@ -96,6 +102,10 @@ def get_platform_flags( opts ):
- 		ldflags.append('-lasound')
- 	#	ldflags.append('-lrubberband')
- 
-+	elif sys.platform[:6] == 'netbsd':
-+		cppflags.append('-pthread')
-+		ldflags.append('-lossaudio')
-+
- 	elif sys.platform == "win32":
- 		includes.append( '3rdparty\libsndfile-1_0_17' )
- 		includes.append( 'build\pthreads\include' )
-@@ -283,6 +293,9 @@ def get_hydrogen_gui( lib_hydrogen , opt
- 		env.Append( LIBS = ["z"] )
- 		env.Append( LIBS = ["pthread"] )
- 
-+	if sys.platform[:6] == "netbsd":
-+		env.Append( LIBS = ["z"] )
-+
- 	if sys.platform == "darwin" and str(env['coreaudio']) == "1":
- 		env.Append( LINKFLAGS = ['-framework','ApplicationServices'])
- 		env.Append( LINKFLAGS = ['-framework','AudioUnit'])
-@@ -302,7 +315,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
- 
- 	#add every img in ./data/img to the install list. 
--	os.path.walk("./data/img/",install_images,env) 
-+	#os.path.walk("./data/img/",install_images,env) 
- 
- 
- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits"))
-@@ -380,7 +393,7 @@ else:
- 
- includes, a , b = get_platform_flags( opts )
- 
--env = Environment(options = opts, CPPPATH = includes)
-+env = Environment(options = opts, ENV=os.environ, CPPPATH = includes)
- 
- 
- Help(opts.GenerateHelpText(env))
diff --git a/audio/hydrogen/patches/patch-ab b/audio/hydrogen/patches/patch-ab
deleted file mode 100644
index 6a60a3133f3..00000000000
--- a/audio/hydrogen/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt4.py.orig	2012-01-21 04:06:58.000000000 -0800
-+++ qt4.py	2012-11-13 02:59:06.000000000 -0800
-@@ -444,7 +444,7 @@
- 		try : self.AppendUnique(CPPDEFINES=moduleDefines[module])
- 		except: pass
- 	debugSuffix = ''
--	if sys.platform.startswith("linux") and not crosscompiling :
-+	if (sys.platform.startswith("linux") and not crosscompiling) or (sys.platform.startswith("netbsd") and not crosscompiling):
- 		if debug : debugSuffix = '_debug'
- 		for module in modules :
- 			if module not in pclessModules : continue
diff --git a/audio/hydrogen/patches/patch-src_gui_src_PlayerControl.cpp b/audio/hydrogen/patches/patch-src_gui_src_PlayerControl.cpp
new file mode 100644
index 00000000000..d7a07a19a02
--- /dev/null
+++ b/audio/hydrogen/patches/patch-src_gui_src_PlayerControl.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_gui_src_PlayerControl.cpp,v 1.1 2014/03/06 10:16:15 mrg Exp $
+
+--- src/gui/src/PlayerControl.cpp.orig	2013-02-21 10:53:51.000000000 -0800
++++ src/gui/src/PlayerControl.cpp	2014-03-06 00:47:13.000000000 -0800
+@@ -624,7 +624,8 @@
+ 
+ 	// time
+ 	float fFrames = m_pEngine->getAudioOutput()->m_transport.m_nFrames;
+-	if ( Preferences::get_instance()->m_bJackTransportMode == Preferences::USE_JACK_TRANSPORT )
++	if ( Preferences::get_instance()->m_bJackTransportMode == Preferences::USE_JACK_TRANSPORT &&
++	     Preferences::get_instance()->m_bJackMasterMode != Preferences::NO_JACK_TIME_MASTER )
+ 		fFrames =  m_pEngine->getHumantimeFrames();
+ 	float fSampleRate = m_pEngine->getAudioOutput()->getSampleRate();
+ 	if ( fSampleRate != 0 ) {