audio/hydrogen: Update to latest commit and switch to Qt 5

PR:		234260
Submitted by:	maintainer

8 files changed, 160 insertions, 334 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 972eb4ea0b09..4ac4ff8fabef 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -2,28 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	hydrogen
-PORTVERSION=	0.9.7
-PORTREVISION=	2
+DISTVERSION=	1.0.0-beta1-325
+DISTVERSIONSUFFIX=	-g538eaeb9
 CATEGORIES=	audio
 
 MAINTAINER=	FreeBSD@ShaneWare.Biz
 COMMENT=	Advanced drum machine
 
-LICENSE=	GPLv2
-
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		liblo.so:audio/liblo
 
+USES=		cmake compiler:c++11-lang desktop-file-utils pkgconfig \
+		localbase qt:5
+USE_QT=		core gui network widgets xml xmlpatterns buildtools_build \
+		linguisttools_build qmake_build
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	hydrogen-music
 
-USES=		cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:4
-USE_QT=		qmake_build moc_build rcc_build uic_build corelib \
-		gui network xml xmlpatterns
-
 OPTIONS_SINGLE=		EXPORT
 OPTIONS_SINGLE_EXPORT=	LIBARCHIVE LIBTAR
 OPTIONS_DEFINE=		ALSA DEBUG JACK LADSPA LASH OSS PORTAUDIO \
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 1a4e997ea6fa..e7fc4a7fc89d 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478447235
-SHA256 (hydrogen-music-hydrogen-0.9.7_GH0.tar.gz) = 1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7
-SIZE (hydrogen-music-hydrogen-0.9.7_GH0.tar.gz) = 6424575
+TIMESTAMP = 1545690791
+SHA256 (hydrogen-music-hydrogen-1.0.0-beta1-325-g538eaeb9_GH0.tar.gz) = 7fc67932be2a94f351f3842c03fd222fbf98834e15fb1aebb3fafa458c6d1cf7
+SIZE (hydrogen-music-hydrogen-1.0.0-beta1-325-g538eaeb9_GH0.tar.gz) = 11364184
diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt
index aa2c370e23df..1d9476197486 100644
--- a/audio/hydrogen/files/patch-CMakeLists.txt
+++ b/audio/hydrogen/files/patch-CMakeLists.txt
@@ -1,27 +1,32 @@
---- CMakeLists.txt.orig	2016-11-05 18:52:50 UTC
+--- CMakeLists.txt.orig	2017-11-21 17:47:16 UTC
 +++ CMakeLists.txt
-@@ -111,9 +111,9 @@ IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "C
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines")
+@@ -196,6 +196,11 @@ ENDIF()
+ FIND_HELPER(LIBARCHIVE libarchive archive.h archive)
+ IF( WANT_LIBARCHIVE AND LIBARCHIVE_FOUND)
+     SET(WANT_LIBTAR FALSE)
++    SET(LIBTAR_LIBRARIES "")
++    SET(LIBTAR_INCLUDE_DIRS "")
++ELSE()
++    SET(LIBARCHIVE_LIBRARIES "")
++    SET(LIBARCHIVE_INCLUDE_DIRS "")
  ENDIF()
+ FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
+ FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
+@@ -205,6 +210,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo)
  
--SET(CMAKE_CXX_FLAGS_RELEASE "")
-+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
- 
--SET(CMAKE_CXX_FLAGS_DEBUG "-g ")#-Winline")
-+SET(CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}")#-Winline")
- 
- 
- IF(APPLE)
-@@ -201,7 +201,11 @@ FIND_HELPER(NSMSESSION liblo lo/lo.h lo)
  IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
  	FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
++ELSEIF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
++	FIND_HELPER(OSS oss sys/soundcard.h c )
  ELSE()
--	FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
-+    IF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
-+        FIND_HELPER(OSS oss sys/soundcard.h c )
-+    ELSE()
-+        FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
-+    ENDIF()
+ 	FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
+ ENDIF()
+@@ -368,7 +375,7 @@ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${H2_UNIX_ICON_PATH}")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
  ENDIF()
  
- FIND_HELPER(JACK jack jack/jack.h jack)
diff --git a/audio/hydrogen/files/patch-src_cli_CMakeLists.txt b/audio/hydrogen/files/patch-src_cli_CMakeLists.txt
deleted file mode 100644
index 2cbd8a839274..000000000000
--- a/audio/hydrogen/files/patch-src_cli_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cli/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
-+++ src/cli/CMakeLists.txt
-@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(
-     ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
-     ${QT_INCLUDES}
-     ${LASH_INCLUDE_DIR}
-+    ${CMAKE_INSTALL_PREFIX}/include
- )
- 
- ADD_EXECUTABLE(h2cli WIN32 MACOSX_BUNDLE ${h2cli_SRCS} )
diff --git a/audio/hydrogen/files/patch-src_gui_CMakeLists.txt b/audio/hydrogen/files/patch-src_gui_CMakeLists.txt
deleted file mode 100644
index 2a37c7edf4d3..000000000000
--- a/audio/hydrogen/files/patch-src_gui_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
-+++ src/gui/CMakeLists.txt
-@@ -22,6 +22,7 @@ INCLUDE_DIRECTORIES(
-     ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
-     ${LASH_INCLUDE_DIR}
-     ${QT_INCLUDES}
-+    ${LIBSNDFILE_INCLUDE_DIR}
- )
- 
- IF(APPLE)
diff --git a/audio/hydrogen/files/patch-src_player_CMakeLists.txt b/audio/hydrogen/files/patch-src_player_CMakeLists.txt
deleted file mode 100644
index 56514f792210..000000000000
--- a/audio/hydrogen/files/patch-src_player_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/player/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
-+++ src/player/CMakeLists.txt
-@@ -4,6 +4,7 @@ FILE(GLOB_RECURSE h2player_SRCS *.cpp)
- INCLUDE_DIRECTORIES(
-     ${CMAKE_SOURCE_DIR}/src/core/include        # core headers
-     ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
-+    ${LIBSNDFILE_INCLUDE_DIR}
-     ${QT_INCLUDES}
- )
- 
diff --git a/audio/hydrogen/files/patch-src_synth_CMakeLists.txt b/audio/hydrogen/files/patch-src_synth_CMakeLists.txt
deleted file mode 100644
index afd0598b62c7..000000000000
--- a/audio/hydrogen/files/patch-src_synth_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/synth/CMakeLists.txt.orig	2014-09-09 18:39:33 UTC
-+++ src/synth/CMakeLists.txt
-@@ -4,6 +4,7 @@ FILE(GLOB_RECURSE h2synth_SRCS *.cpp)
- INCLUDE_DIRECTORIES(
-     ${CMAKE_SOURCE_DIR}/src/core/include        # core headers
-     ${CMAKE_BINARY_DIR}/src/core/include        # generated config.h
-+    ${LIBSNDFILE_INCLUDE_DIR}
-     ${QT_INCLUDES}
- )
- 
diff --git a/audio/hydrogen/pkg-plist b/audio/hydrogen/pkg-plist
index 9f11a9eb3cfb..7260e81a70b2 100644
--- a/audio/hydrogen/pkg-plist
+++ b/audio/hydrogen/pkg-plist
@@ -1,6 +1,5 @@
 bin/h2cli
 bin/h2player
-bin/h2synth
 bin/hydrogen
 include/hydrogen/IO/AlsaAudioDriver.h
 include/hydrogen/IO/AlsaMidiDriver.h
@@ -9,8 +8,8 @@ include/hydrogen/IO/CoreAudioDriver.h
 include/hydrogen/IO/CoreMidiDriver.h
 include/hydrogen/IO/DiskWriterDriver.h
 include/hydrogen/IO/FakeDriver.h
+include/hydrogen/IO/JackAudioDriver.h
 include/hydrogen/IO/JackMidiDriver.h
-include/hydrogen/IO/JackOutput.h
 include/hydrogen/IO/MidiCommon.h
 include/hydrogen/IO/MidiInput.h
 include/hydrogen/IO/MidiOutput.h
@@ -24,7 +23,9 @@ include/hydrogen/LashClient.h
 include/hydrogen/LocalFileMng.h
 include/hydrogen/Preferences.h
 include/hydrogen/audio_engine.h
+include/hydrogen/automation_path_serializer.h
 include/hydrogen/basics/adsr.h
+include/hydrogen/basics/automation_path.h
 include/hydrogen/basics/drumkit.h
 include/hydrogen/basics/drumkit_component.h
 include/hydrogen/basics/instrument.h
@@ -34,15 +35,18 @@ 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/playlist.h
 include/hydrogen/basics/sample.h
 include/hydrogen/basics/song.h
 include/hydrogen/config.h
+include/hydrogen/core_action_controller.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/files.h
 include/hydrogen/helpers/filesystem.h
 include/hydrogen/helpers/legacy.h
 include/hydrogen/helpers/xml.h
@@ -54,7 +58,7 @@ include/hydrogen/midi_map.h
 include/hydrogen/nsm.h
 include/hydrogen/nsm_client.h
 include/hydrogen/object.h
-include/hydrogen/playlist.h
+include/hydrogen/osc_server.h
 include/hydrogen/rt_clock.h
 include/hydrogen/sampler/Sampler.h
 include/hydrogen/smf/SMF.h
@@ -63,10 +67,11 @@ include/hydrogen/synth/Synth.h
 include/hydrogen/timehelper.h
 include/hydrogen/timeline.h
 include/hydrogen/version.h
-lib/libhydrogen-core-0.9.7.so
+lib/libhydrogen-core-1.0.0.so
 man/man1/hydrogen.1.gz
 share/appdata/hydrogen.appdata.xml
 share/applications/hydrogen.desktop
+share/icons/hicolor/scalable/apps/h2-icon.svg
 %%DATADIR%%/data/DefaultSong.h2song
 %%DATADIR%%/data/click.wav
 %%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song
@@ -76,224 +81,93 @@ share/applications/hydrogen.desktop
 %%DATADIR%%/data/demo_songs/GM_kit_demo3.h2song
 %%DATADIR%%/data/demo_songs/TR808kit-demo.h2song
 %%DATADIR%%/data/demo_songs/tutorial_georgyporgy.h2song
-%%DATADIR%%/data/doc/Makefile
-%%DATADIR%%/data/doc/MidiInstrumentMapping.ods
-%%DATADIR%%/data/doc/README.DOCUMENTATION.txt
-%%DATADIR%%/data/doc/TODO
-%%DATADIR%%/data/doc/img/AudioEngineInfoDialog.png
-%%DATADIR%%/data/doc/img/CreateNewPattern.png
-%%DATADIR%%/data/doc/img/Downloading_SoundLibrary.png
-%%DATADIR%%/data/doc/img/DrumkitExport.png
-%%DATADIR%%/data/doc/img/DrumkitImport.png
-%%DATADIR%%/data/doc/img/DrumkitLoad.png
-%%DATADIR%%/data/doc/img/DrumkitSave.png
-%%DATADIR%%/data/doc/img/Export_song.png
-%%DATADIR%%/data/doc/img/FX_send_knobs.png
-%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5.png
-%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5_v2.png
-%%DATADIR%%/data/doc/img/HearNewNotes.png
-%%DATADIR%%/data/doc/img/Hydrogen_0.9.5_gui.png
-%%DATADIR%%/data/doc/img/InstrumentMapping.png
-%%DATADIR%%/data/doc/img/Instrument_General.png
-%%DATADIR%%/data/doc/img/Instrument_Layers.png
-%%DATADIR%%/data/doc/img/JackTrans_Master.png
-%%DATADIR%%/data/doc/img/LADSPA_FX_Properties.png
-%%DATADIR%%/data/doc/img/MainControls_Rubberband_btn.png
-%%DATADIR%%/data/doc/img/MainModePattern.png
-%%DATADIR%%/data/doc/img/MainModeSong.png
-%%DATADIR%%/data/doc/img/MainPlay.png
-%%DATADIR%%/data/doc/img/MainRecord.png
-%%DATADIR%%/data/doc/img/MainStop.png
-%%DATADIR%%/data/doc/img/MainToolbar.png
-%%DATADIR%%/data/doc/img/MainToolbar_V2.png
-%%DATADIR%%/data/doc/img/MainUI_tabbed.png
-%%DATADIR%%/data/doc/img/MeasureSettings.png
-%%DATADIR%%/data/doc/img/MidiIN_CPU.png
-%%DATADIR%%/data/doc/img/Midi_Actions.png
-%%DATADIR%%/data/doc/img/Mixer.png
-%%DATADIR%%/data/doc/img/MixerDelay.png
-%%DATADIR%%/data/doc/img/MixerFX.png
-%%DATADIR%%/data/doc/img/MixerFXButton.png
-%%DATADIR%%/data/doc/img/MixerFXEdit.png
-%%DATADIR%%/data/doc/img/MixerFXEditButton.png
-%%DATADIR%%/data/doc/img/MixerFXKnob.png
-%%DATADIR%%/data/doc/img/MixerFXSelect.png
-%%DATADIR%%/data/doc/img/MixerLED.png
-%%DATADIR%%/data/doc/img/MixerLoadSample.png
-%%DATADIR%%/data/doc/img/MixerMute.png
-%%DATADIR%%/data/doc/img/MixerPan.png
-%%DATADIR%%/data/doc/img/MixerPlayTest.png
-%%DATADIR%%/data/doc/img/MixerSolo.png
-%%DATADIR%%/data/doc/img/MovePatternDown.png
-%%DATADIR%%/data/doc/img/MovePatternUp.png
-%%DATADIR%%/data/doc/img/NoteKey.png
-%%DATADIR%%/data/doc/img/NoteOff_NoteLength.png
-%%DATADIR%%/data/doc/img/PatternEditor.png
-%%DATADIR%%/data/doc/img/PatternEditorButtons.png
-%%DATADIR%%/data/doc/img/PatternEditorControls.png
-%%DATADIR%%/data/doc/img/PatternEditorDownUp.png
-%%DATADIR%%/data/doc/img/PatternEditorInstr.png
-%%DATADIR%%/data/doc/img/PatternEditorInstr_V2.png
-%%DATADIR%%/data/doc/img/PatternEditorPattern.png
-%%DATADIR%%/data/doc/img/PatternEditorRecording.png
-%%DATADIR%%/data/doc/img/PatternEditorSizeRes.png
-%%DATADIR%%/data/doc/img/PatternEditor_DrumMode.png
-%%DATADIR%%/data/doc/img/PatternEditor_PianoMode.png
-%%DATADIR%%/data/doc/img/PreferencesAppearance.png
-%%DATADIR%%/data/doc/img/PreferencesAppearance_V2.png
-%%DATADIR%%/data/doc/img/PreferencesAudioSystem.png
-%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V2.png
-%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V3.png
-%%DATADIR%%/data/doc/img/PreferencesGeneral.png
-%%DATADIR%%/data/doc/img/PreferencesGeneral_V2.png
-%%DATADIR%%/data/doc/img/PreferencesGeneral_V3.png
-%%DATADIR%%/data/doc/img/PreferencesMidiSystem.png
-%%DATADIR%%/data/doc/img/PreferencesMidiSystem_V2.png
-%%DATADIR%%/data/doc/img/Rec_button.png
-%%DATADIR%%/data/doc/img/Res.png
-%%DATADIR%%/data/doc/img/SampleEditor.png
-%%DATADIR%%/data/doc/img/SampleEditor_V5.png
-%%DATADIR%%/data/doc/img/SongEditor.png
-%%DATADIR%%/data/doc/img/SongEditorAddLayer.png
-%%DATADIR%%/data/doc/img/SongEditorButtons.png
-%%DATADIR%%/data/doc/img/SongEditorInsertMode.png
-%%DATADIR%%/data/doc/img/SongEditorLayerClear.png
-%%DATADIR%%/data/doc/img/SongEditorLayerDownUp.png
-%%DATADIR%%/data/doc/img/SongEditorSelectInsertMode.png
-%%DATADIR%%/data/doc/img/SongEditorSelectMode.png
-%%DATADIR%%/data/doc/img/SongLoop.png
-%%DATADIR%%/data/doc/img/SongOperations.png
-%%DATADIR%%/data/doc/img/SoundLibrary.png
-%%DATADIR%%/data/doc/img/Sound_Library_import.png
-%%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V3.png
-%%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V4.png
-%%DATADIR%%/data/doc/img/Tutorial2.h2song
-%%DATADIR%%/data/doc/img/TutorialEnd.png
-%%DATADIR%%/data/doc/img/TutorialStart.png
-%%DATADIR%%/data/doc/img/Virtual_patterns_menu.png
-%%DATADIR%%/data/doc/img/add_tag.png
-%%DATADIR%%/data/doc/img/add_tempo_change.png
-%%DATADIR%%/data/doc/img/background_BPM.png
-%%DATADIR%%/data/doc/img/background_Control.png
-%%DATADIR%%/data/doc/img/background_Control_V2.png
-%%DATADIR%%/data/doc/img/background_Load.png
-%%DATADIR%%/data/doc/img/background_Mode.png
-%%DATADIR%%/data/doc/img/bg_topPanel.png
-%%DATADIR%%/data/doc/img/bpm.png
-%%DATADIR%%/data/doc/img/btn_clear_off.png
-%%DATADIR%%/data/doc/img/btn_draw.png
-%%DATADIR%%/data/doc/img/btn_edit_on.png
-%%DATADIR%%/data/doc/img/btn_hear.png
-%%DATADIR%%/data/doc/img/btn_hear_on.png
-%%DATADIR%%/data/doc/img/btn_live_on.png
-%%DATADIR%%/data/doc/img/btn_loop_on.png
-%%DATADIR%%/data/doc/img/btn_mute_on.png
-%%DATADIR%%/data/doc/img/btn_new_on.png
-%%DATADIR%%/data/doc/img/btn_on_on.png
-%%DATADIR%%/data/doc/img/btn_pattern_mode.png
-%%DATADIR%%/data/doc/img/btn_play_on.png
-%%DATADIR%%/data/doc/img/btn_play_on_mixer.png
-%%DATADIR%%/data/doc/img/btn_quant_off.png
-%%DATADIR%%/data/doc/img/btn_quant_on.png
-%%DATADIR%%/data/doc/img/btn_quant_over.png
-%%DATADIR%%/data/doc/img/btn_record_off.png
-%%DATADIR%%/data/doc/img/btn_record_over.png
-%%DATADIR%%/data/doc/img/btn_select.png
-%%DATADIR%%/data/doc/img/btn_select_off.png
-%%DATADIR%%/data/doc/img/btn_select_on.png
-%%DATADIR%%/data/doc/img/btn_solo_on.png
-%%DATADIR%%/data/doc/img/btn_song_on.png
-%%DATADIR%%/data/doc/img/btn_stop_on.png
-%%DATADIR%%/data/doc/img/btn_updown.png
-%%DATADIR%%/data/doc/img/bypass_on.png
-%%DATADIR%%/data/doc/img/bypass_over.png
-%%DATADIR%%/data/doc/img/cpuload.png
-%%DATADIR%%/data/doc/img/downBtn_on.png
-%%DATADIR%%/data/doc/img/edit_off.png
-%%DATADIR%%/data/doc/img/fill_clear_pattern.png
-%%DATADIR%%/data/doc/img/hearBtn_on.png
-%%DATADIR%%/data/doc/img/instr_ed0.png
-%%DATADIR%%/data/doc/img/instr_ed1.png
-%%DATADIR%%/data/doc/img/item_selected.png
-%%DATADIR%%/data/doc/img/jack_transport.png
-%%DATADIR%%/data/doc/img/midi_in.png
-%%DATADIR%%/data/doc/img/mixer-instrrack_btn.png
-%%DATADIR%%/data/doc/img/newPatternBtn_on.png
-%%DATADIR%%/data/doc/img/nl/DrumkitExport.png
-%%DATADIR%%/data/doc/img/nl/DrumkitImport.png
-%%DATADIR%%/data/doc/img/nl/DrumkitLoad.png
-%%DATADIR%%/data/doc/img/nl/DrumkitSave.png
-%%DATADIR%%/data/doc/img/nl/InstrumentEditorInstrument.png
-%%DATADIR%%/data/doc/img/nl/InstrumentEditorLayer.png
-%%DATADIR%%/data/doc/img/nl/Mixer.png
-%%DATADIR%%/data/doc/img/nl/MixerFX.png
-%%DATADIR%%/data/doc/img/nl/MixerFXEdit.png
-%%DATADIR%%/data/doc/img/nl/MixerFXSelect.png
-%%DATADIR%%/data/doc/img/nl/PatternEditor.png
-%%DATADIR%%/data/doc/img/nl/PreferencesAppearance.png
-%%DATADIR%%/data/doc/img/nl/PreferencesAudioSystem.png
-%%DATADIR%%/data/doc/img/nl/PreferencesMidiSystem.png
-%%DATADIR%%/data/doc/img/nl/SongEditor.png
-%%DATADIR%%/data/doc/img/nl/SongEditorInsertMode.png
-%%DATADIR%%/data/doc/img/nl/SongEditorSelectMode.png
-%%DATADIR%%/data/doc/img/nl/SongEditorSelectModeCopy.png
-%%DATADIR%%/data/doc/img/pattern_properties.png
-%%DATADIR%%/data/doc/img/quantBtn_off.png
-%%DATADIR%%/data/doc/img/quantBtn_on.png
-%%DATADIR%%/data/doc/img/recBtn_on.png
-%%DATADIR%%/data/doc/img/screenshot-director.png
-%%DATADIR%%/data/doc/img/showFX_on.png
-%%DATADIR%%/data/doc/img/showPeaks_on.png
-%%DATADIR%%/data/doc/img/songFuncBtn_on.png
-%%DATADIR%%/data/doc/img/stacked_mode_V3.png
-%%DATADIR%%/data/doc/img/tag_bar.png
-%%DATADIR%%/data/doc/img/tastiera.png
-%%DATADIR%%/data/doc/img/tempo_bar.png
-%%DATADIR%%/data/doc/img/upBtn_on.png
-%%DATADIR%%/data/doc/img_tutorial/Bridge1_4th.png
-%%DATADIR%%/data/doc/img_tutorial/Bridge3_3a_hh.png
-%%DATADIR%%/data/doc/img_tutorial/C3_6+7.png
-%%DATADIR%%/data/doc/img_tutorial/Intro4th.png
-%%DATADIR%%/data/doc/img_tutorial/PatternBase1.png
-%%DATADIR%%/data/doc/img_tutorial/PatternBase2.png
-%%DATADIR%%/data/doc/img_tutorial/Riff1b.png
-%%DATADIR%%/data/doc/img_tutorial/Riff1c.png
-%%DATADIR%%/data/doc/img_tutorial/Riff1d.png
-%%DATADIR%%/data/doc/img_tutorial/Verse8th.png
-%%DATADIR%%/data/doc/img_tutorial/VerseAll.png
-%%DATADIR%%/data/doc/img_tutorial/VerseBridge.png
-%%DATADIR%%/data/doc/img_tutorial/VerseBridge_hh.png
-%%DATADIR%%/data/doc/manual.docbook
-%%DATADIR%%/data/doc/manual.html
-%%DATADIR%%/data/doc/manual.pot
-%%DATADIR%%/data/doc/manual_ca.po
-%%DATADIR%%/data/doc/manual_en.html
-%%DATADIR%%/data/doc/manual_es.po
-%%DATADIR%%/data/doc/manual_fr.po
-%%DATADIR%%/data/doc/manual_it.po
-%%DATADIR%%/data/doc/manual_nl.po
-%%DATADIR%%/data/doc/tutorial.docbook
-%%DATADIR%%/data/doc/tutorial.pot
-%%DATADIR%%/data/doc/tutorial_fr.po
-%%DATADIR%%/data/doc/tutorial_it.po
-%%DATADIR%%/data/drumkits/GMkit/clap_Dry_c.flac
-%%DATADIR%%/data/drumkits/GMkit/cra_Jazz.flac
-%%DATADIR%%/data/drumkits/GMkit/cra_Rock_a.flac
-%%DATADIR%%/data/drumkits/GMkit/cym_Jazz.flac
-%%DATADIR%%/data/drumkits/GMkit/cym_Rock_b.flac
-%%DATADIR%%/data/drumkits/GMkit/drumkit.xml
-%%DATADIR%%/data/drumkits/GMkit/emptySample.flac
-%%DATADIR%%/data/drumkits/GMkit/hhc_Dry_a.flac
-%%DATADIR%%/data/drumkits/GMkit/hhc_Rock_b.flac
-%%DATADIR%%/data/drumkits/GMkit/hhp_Dry_a.flac
-%%DATADIR%%/data/drumkits/GMkit/kick_Dry_b.flac
-%%DATADIR%%/data/drumkits/GMkit/misc_Cowbell.flac
-%%DATADIR%%/data/drumkits/GMkit/sn_Jazz_c.flac
-%%DATADIR%%/data/drumkits/GMkit/sn_Wet_b.flac
-%%DATADIR%%/data/drumkits/GMkit/stick_Woody.flac
-%%DATADIR%%/data/drumkits/GMkit/tom_Rock_hi.flac
-%%DATADIR%%/data/drumkits/GMkit/tom_Rock_lo.flac
-%%DATADIR%%/data/drumkits/GMkit/tom_Rock_mid.flac
+%%DATADIR%%/data/drumkits/GMRockKit/24Ride-1.wav
+%%DATADIR%%/data/drumkits/GMRockKit/24Ride-2.wav
+%%DATADIR%%/data/drumkits/GMRockKit/24Ride-3.wav
+%%DATADIR%%/data/drumkits/GMRockKit/24Ride-4.wav
+%%DATADIR%%/data/drumkits/GMRockKit/24Ride-5.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Bell-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Bell-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Bell-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Bell-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Bell-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Cowbell-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Cowbell-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Cowbell-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Cowbell-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Cowbell-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Crash-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Crash-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Crash-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Crash-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Crash-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HandClap.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatClosed-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatClosed-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatClosed-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatClosed-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatClosed-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatOpen-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatOpen-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatOpen-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatOpen-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatOpen-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatPedal-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatPedal-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatPedal-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatPedal-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatPedal-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatSemiOpen-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatSemiOpen-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatSemiOpen-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatSemiOpen-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/HatSemiOpen-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Kick-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Kick-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Kick-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Kick-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Kick-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Ride-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Ride-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Ride-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Ride-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Ride-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SideStick-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SideStick-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SideStick-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SideStick-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SideStick-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Snare-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Snare-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Snare-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Snare-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Snare-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SnareRimshot-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SnareRimshot-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SnareRimshot-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SnareRimshot-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/SnareRimshot-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Splash-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Splash-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Splash-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Splash-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Splash-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom1-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom1-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom1-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom1-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom1-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom2-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom2-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom2-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom2-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/Tom2-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/TomFloor-Hard.wav
+%%DATADIR%%/data/drumkits/GMRockKit/TomFloor-Hardest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/TomFloor-Med.wav
+%%DATADIR%%/data/drumkits/GMRockKit/TomFloor-Soft.wav
+%%DATADIR%%/data/drumkits/GMRockKit/TomFloor-Softest.wav
+%%DATADIR%%/data/drumkits/GMRockKit/drumkit.xml
 %%DATADIR%%/data/drumkits/TR808EmulationKit/808_Clap.flac
 %%DATADIR%%/data/drumkits/TR808EmulationKit/808_Clave.flac
 %%DATADIR%%/data/drumkits/TR808EmulationKit/808_Conga.flac
@@ -313,42 +187,24 @@ share/applications/hydrogen.desktop
 %%DATADIR%%/data/drumkits/TR808EmulationKit/drumkit.xml
 %%DATADIR%%/data/emptySample.wav
 %%DATADIR%%/data/hydrogen.default.conf
-%%DATADIR%%/data/i18n/hydrogen.ca.qm
-%%DATADIR%%/data/i18n/hydrogen.ca.ts
-%%DATADIR%%/data/i18n/hydrogen.cs.qm
-%%DATADIR%%/data/i18n/hydrogen.cs.ts
-%%DATADIR%%/data/i18n/hydrogen.de.qm
-%%DATADIR%%/data/i18n/hydrogen.de.ts
-%%DATADIR%%/data/i18n/hydrogen.el.qm
-%%DATADIR%%/data/i18n/hydrogen.el.ts
-%%DATADIR%%/data/i18n/hydrogen.es.qm
-%%DATADIR%%/data/i18n/hydrogen.es.ts
-%%DATADIR%%/data/i18n/hydrogen.fr.qm
-%%DATADIR%%/data/i18n/hydrogen.fr.ts
-%%DATADIR%%/data/i18n/hydrogen.gl.qm
-%%DATADIR%%/data/i18n/hydrogen.gl.ts
-%%DATADIR%%/data/i18n/hydrogen.hr.qm
-%%DATADIR%%/data/i18n/hydrogen.hr.ts
-%%DATADIR%%/data/i18n/hydrogen.hu_HU.qm
-%%DATADIR%%/data/i18n/hydrogen.hu_HU.ts
-%%DATADIR%%/data/i18n/hydrogen.it.qm
-%%DATADIR%%/data/i18n/hydrogen.it.ts
-%%DATADIR%%/data/i18n/hydrogen.ja.qm
-%%DATADIR%%/data/i18n/hydrogen.ja.ts
-%%DATADIR%%/data/i18n/hydrogen.nl.qm
-%%DATADIR%%/data/i18n/hydrogen.nl.ts
-%%DATADIR%%/data/i18n/hydrogen.pl.qm
-%%DATADIR%%/data/i18n/hydrogen.pl.ts
-%%DATADIR%%/data/i18n/hydrogen.pt_BR.qm
-%%DATADIR%%/data/i18n/hydrogen.pt_BR.ts
-%%DATADIR%%/data/i18n/hydrogen.ru.qm
-%%DATADIR%%/data/i18n/hydrogen.ru.ts
-%%DATADIR%%/data/i18n/hydrogen.sr.qm
-%%DATADIR%%/data/i18n/hydrogen.sr.ts
-%%DATADIR%%/data/i18n/hydrogen.sv.qm
-%%DATADIR%%/data/i18n/hydrogen.sv.ts
-%%DATADIR%%/data/i18n/stats.py
-%%DATADIR%%/data/i18n/updateTranslations.sh
+%%DATADIR%%/data/i18n/hydrogen_ca.qm
+%%DATADIR%%/data/i18n/hydrogen_cs.qm
+%%DATADIR%%/data/i18n/hydrogen_de.qm
+%%DATADIR%%/data/i18n/hydrogen_el.qm
+%%DATADIR%%/data/i18n/hydrogen_es.qm
+%%DATADIR%%/data/i18n/hydrogen_fr.qm
+%%DATADIR%%/data/i18n/hydrogen_gl.qm
+%%DATADIR%%/data/i18n/hydrogen_hr.qm
+%%DATADIR%%/data/i18n/hydrogen_hu_HU.qm
+%%DATADIR%%/data/i18n/hydrogen_it.qm
+%%DATADIR%%/data/i18n/hydrogen_ja.qm
+%%DATADIR%%/data/i18n/hydrogen_nl.qm
+%%DATADIR%%/data/i18n/hydrogen_pl.qm
+%%DATADIR%%/data/i18n/hydrogen_pt_BR.qm
+%%DATADIR%%/data/i18n/hydrogen_ru.qm
+%%DATADIR%%/data/i18n/hydrogen_sr.qm
+%%DATADIR%%/data/i18n/hydrogen_sv.qm
+%%DATADIR%%/data/i18n/hydrogen_uk.qm
 %%DATADIR%%/data/img/gray/about/aboutLogo.png
 %%DATADIR%%/data/img/gray/audiFileBrowser/go-home.png
 %%DATADIR%%/data/img/gray/audiFileBrowser/go-up.png
@@ -400,7 +256,6 @@ share/applications/hydrogen.desktop
 %%DATADIR%%/data/img/gray/lcd/LCDSpinBox_up_off.png
 %%DATADIR%%/data/img/gray/lcd/LCDSpinBox_up_on.png
 %%DATADIR%%/data/img/gray/lcd/LCDSpinBox_up_over.png
-%%DATADIR%%/data/img/gray/mdiBackground.png
 %%DATADIR%%/data/img/gray/mixerPanel/background_FX.png
 %%DATADIR%%/data/img/gray/mixerPanel/btn_edit_off.png
 %%DATADIR%%/data/img/gray/mixerPanel/btn_edit_on.png
@@ -458,11 +313,8 @@ share/applications/hydrogen.desktop
 %%DATADIR%%/data/img/gray/mixerPanel/showPeaks_over.png
 %%DATADIR%%/data/img/gray/patternEditor/background_channel.png
 %%DATADIR%%/data/img/gray/patternEditor/background_rec-new.png
-%%DATADIR%%/data/img/gray/patternEditor/background_rec.png
 %%DATADIR%%/data/img/gray/patternEditor/background_res-new.png
-%%DATADIR%%/data/img/gray/patternEditor/background_res.png
 %%DATADIR%%/data/img/gray/patternEditor/background_zoom-new.png
-%%DATADIR%%/data/img/gray/patternEditor/background_zoom.png
 %%DATADIR%%/data/img/gray/patternEditor/btn_dropdown_off.png
 %%DATADIR%%/data/img/gray/patternEditor/btn_dropdown_on.png
 %%DATADIR%%/data/img/gray/patternEditor/btn_dropdown_over.png
@@ -603,12 +455,20 @@ share/applications/hydrogen.desktop
 %%DATADIR%%/data/img/gray/songEditor/btn_up_off.png
 %%DATADIR%%/data/img/gray/songEditor/btn_up_on.png
 %%DATADIR%%/data/img/gray/songEditor/btn_up_over.png
+%%DATADIR%%/data/img/gray/songEditor/btn_viewPL_off.png
+%%DATADIR%%/data/img/gray/songEditor/btn_viewPL_on.png
+%%DATADIR%%/data/img/gray/songEditor/btn_viewPL_over.png
+%%DATADIR%%/data/img/gray/songEditor/btn_viewTL_off.png
+%%DATADIR%%/data/img/gray/songEditor/btn_viewTL_on.png
+%%DATADIR%%/data/img/gray/songEditor/btn_viewTL_over.png
 %%DATADIR%%/data/img/gray/songEditor/playingPattern_off.png
 %%DATADIR%%/data/img/gray/songEditor/playingPattern_on.png
 %%DATADIR%%/data/img/gray/songEditor/songEditorLabelABG.png
 %%DATADIR%%/data/img/gray/songEditor/songEditorLabelBG.png
 %%DATADIR%%/data/img/gray/songEditor/songEditorLabelSBG.png
 %%DATADIR%%/data/img/gray/splash/splash.png
+%%DATADIR%%/data/img/gray/warning.png
+%%DATADIR%%/data/img/gray/warning.svg
 %%DATADIR%%/data/img/gray/waveDisplay/background.png
 %%DATADIR%%/data/img/gray/waveDisplay/bgsamplewavedisplay.png
 %%DATADIR%%/data/img/gray/waveDisplay/detailsamplewavedisplay.png
@@ -633,3 +493,4 @@ share/applications/hydrogen.desktop
 %%DATADIR%%/data/new_tutorial/tutorial_en.html
 %%DATADIR%%/data/xsd/drumkit.xsd
 %%DATADIR%%/data/xsd/drumkit_pattern.xsd
+%%DATADIR%%/data/xsd/playlist.xsd