summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/hydrogen/Makefile118
-rw-r--r--audio/hydrogen/distinfo4
-rw-r--r--audio/hydrogen/files/patch-CMakeLists.txt52
-rw-r--r--audio/hydrogen/files/patch-Sconstruct57
-rw-r--r--audio/hydrogen/files/patch-src__cli__CMakeLists.txt10
-rw-r--r--audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h14
-rw-r--r--audio/hydrogen/files/patch-src__gui__CMakeLists.txt10
-rw-r--r--audio/hydrogen/files/patch-src__player__CMakeLists.txt10
-rw-r--r--audio/hydrogen/files/patch-src__synth__CMakeLists.txt10
-rw-r--r--audio/hydrogen/pkg-plist363
10 files changed, 373 insertions, 275 deletions
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index b5b368cc28cf..7547f581deef 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -2,77 +2,69 @@
# $FreeBSD$
PORTNAME= hydrogen
-PORTVERSION= 0.9.5.1
-PORTREVISION= 1
+PORTVERSION= 0.9.6.1
CATEGORIES= audio
-MASTER_SITES= SF/${PORTNAME}/Hydrogen/${MAJORVERSION}%20Sources
+MASTER_SITES= GH
MAINTAINER= FreeBSD@ShaneWare.Biz
COMMENT= Advanced drum machine
LICENSE= GPLv2
+LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile
+
CONFLICTS= hydrogen-devel-0.*
-LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile \
- libtar.so:${PORTSDIR}/devel/libtar \
- liblrdf.so:${PORTSDIR}/textproc/liblrdf
-
-MAJORVERSION= 0.9.5
-USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
-USES= pkgconfig scons
-
-OPTIONS_DEFINE= JACK ALSA PORTAUDIO LIBARCHIVE LASH
-OPTIONS_DEFAULT= JACK
-
-LIBARCHIVE_DESC= LibArchive support
-
-post-patch:
- ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include', '-I${LOCALBASE}/include/raptor2'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork']|g" ${WRKSRC}/Sconstruct
-
-.include <bsd.port.options.mk>
-
-MAKE_ARGS+= oss=1
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack
-MAKE_ARGS+= jack=1
-.else
-MAKE_ARGS+= jack=0
-.endif
-
-.if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio
-MAKE_ARGS+= portaudio=1
-.else
-MAKE_ARGS+= portaudio=0
-.endif
-
-.if ${PORT_OPTIONS:MLIBARCHIVE}
-LIB_DEPENDS+= libarchive.so:${PORTSDIR}/archivers/libarchive
-MAKE_ARGS+= libarchive=1
-.else
-MAKE_ARGS+= libarchive=0
-.endif
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-MAKE_ARGS+= alsa=1
-.else
-MAKE_ARGS+= alsa=0
-.endif
-
-.if ${PORT_OPTIONS:MLASH}
-LIB_DEPENDS+= liblash.so:${PORTSDIR}/audio/lash
-MAKE_ARGS+= lash=1
-.else
-MAKE_ARGS+= lash=0
-.endif
-
-MAKE_ARGS+= cppflags="${CXXFLAGS}" linkflags="${LINKFLAGS}" prefix="${PREFIX}" CC="${CC}" CXX="${CXX}"
-
-pre-install:
- -@${RM} -rf ${WRKSRC}/data/doc/man
+USE_GITHUB= yes
+GH_ACCOUNT= hydrogen-music
+GH_PROJECT= hydrogen
+GH_TAGNAME= 0.9.6.1
+GH_COMMIT= 71ec7c5
+
+USE_QT4= corelib gui qmake_build linguist_build moc_build network \
+ qt3support rcc_build sql uic_build xml
+USES= cmake:outsource desktop-file-utils pkgconfig
+CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=ON -DWANT_DEBUG:BOOL=OFF \
+ -DLIBSNDFILE_INCLUDE_DIR:STRING=${LOCALBASE}/include \
+ -DWANT_OSS:BOOL=ON
+USE_LDCONFIG= yes
+LDFLAGS+= -L${LOCALBASE}/lib
+
+OPTIONS_DEFINE= ALSA JACK LADSPA LASH PORTAUDIO PULSEAUDIO RDF
+OPTIONS_DEFAULT= JACK LADSPA RDF
+
+ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON
+ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF
+ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_RUN_DEPENDS= alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
+
+JACK_CMAKE_ON= -DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
+JACK_CMAKE_OFF= -DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
+JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
+
+LADSPA_CMAKE_ON= -DWANT_LADSPA:BOOL=ON \
+ -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
+LADSPA_CMAKE_OFF= -DWANT_LADSPA:BOOL=OFF
+LADSPA_BUILD_DEPENDS= ladspa>=0:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS= analyseplugin:${PORTSDIR}/audio/ladspa
+
+LASH_CMAKE_ON= -DWANT_LASH:BOOL=ON
+LASH_CMAKE_OFF= -DWANT_LASH:BOOL=OFF
+LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash
+
+PORTAUDIO_CMAKE_ON= -DWANT_PORTAUDIO:BOOL=ON \
+ -DPORTAUDIO_LIBRARIES:STRING=${LOCALBASE}/lib/portaudio2/libportaudio.so
+PORTAUDIO_CMAKE_OFF= -DWANT_PORTAUDIO:BOOL=OFF
+PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+
+PULSEAUDIO_CMAKE_ON= -DWANT_PULSEAUDIO:BOOL=ON
+PULSEAUDIO_CMAKE_OFF= -DWANT_PULSEAUDIO:BOOL=OFF
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+
+RDF_DESC= RDF File support
+RDF_CMAKE_ON= -DWANT_LRDF:BOOL=ON \
+ -DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2
+RDF_CMAKE_OFF= -DWANT_LRDF:BOOL=OFF
+RDF_LIB_DEPENDS= liblrdf.so:${PORTSDIR}/textproc/liblrdf
.include <bsd.port.mk>
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 1c79f17e97de..4f72171e5b2a 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.5.1.tar.gz) = ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb
-SIZE (hydrogen-0.9.5.1.tar.gz) = 5515314
+SHA256 (hydrogen-0.9.6.1.tar.gz) = 1837739acd7aa27d27930e314a1759bbdcb97dac592b5e1b4907c2b0c23fbc3e
+SIZE (hydrogen-0.9.6.1.tar.gz) = 6625987
diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..f26249d5d913
--- /dev/null
+++ b/audio/hydrogen/files/patch-CMakeLists.txt
@@ -0,0 +1,52 @@
+--- CMakeLists.txt.orig 2014-09-09 20:39:33.000000000 +0200
++++ CMakeLists.txt 2014-09-18 10:21:00.739505710 +0200
+@@ -100,12 +100,12 @@
+ IF(APPLE)
+ SET(CMAKE_CXX_FLAGS "-O2")
+ ELSE()
+- SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines")
++ SET(CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
+ ENDIF()
+
+-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)
+@@ -138,7 +138,6 @@
+ ENDIF(APPLE)
+ ENDIF(WIN32)
+
+-
+ #
+ # HEADER LIBRARY FUNCTIONS
+ #
+@@ -178,7 +177,11 @@
+ IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
+ FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
+ 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()
+ ENDIF()
+
+ FIND_HELPER(JACK jack jack/jack.h jack)
+@@ -195,9 +198,9 @@
+ FIND_HELPER(LASH lash-1.0 lash/lash.h lash)
+ FIND_HELPER(LRDF lrdf lrdf.h lrdf)
+
+-IF(LRDF_FOUND)
+- include_directories(${LRDF_INCLUDE_DIRS}) # see github issue 194
+-ENDIF(LRDF_FOUND)
++#IF(LRDF_FOUND)
++# include_directories(${LRDF_INCLUDE_DIRS}) # see github issue 194
++#ENDIF(LRDF_FOUND)
+
+ FIND_HELPER(RUBBERBAND rubberband RubberBandStretcher.h rubberband)
+ FIND_HELPER(CPPUNIT cppunit cppunit/TestCase.h cppunit)
diff --git a/audio/hydrogen/files/patch-Sconstruct b/audio/hydrogen/files/patch-Sconstruct
deleted file mode 100644
index f817238e3c03..000000000000
--- a/audio/hydrogen/files/patch-Sconstruct
+++ /dev/null
@@ -1,57 +0,0 @@
---- Sconstruct.orig 2012-02-20 08:24:05.000000000 +1030
-+++ Sconstruct 2013-04-12 16:49:47.220965697 +0930
-@@ -47,7 +47,7 @@
-
- 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 > "freebsd":
- if str(env['debug']) == "1":
- cppflags += ['-Wall', '-g2', '-ggdb', '-O0']
- for flag in env["optflags"].split(" "):
-@@ -91,11 +91,13 @@
- includes.append( '/opt/local/include' )
- includes.append( '/usr/local/include/jack' )
-
-- elif sys.platform == 'linux2' or sys.platform == 'linux3':
-+ elif str(env['alsa']) == "1" and sys.platform > 'freebsd' :
- ldflags.append('-lpthread')
- ldflags.append('-lasound')
- # ldflags.append('-lrubberband')
-
-+ elif sys.platform > 'freebsd' :
-+ print "Alsa disabled; nothing to do"
- elif sys.platform == "win32":
- includes.append( '3rdparty\libsndfile-1_0_17' )
- includes.append( 'build\pthreads\include' )
-@@ -279,7 +281,7 @@
- if str(env['lash']) == "1":
- env.ParseConfig('pkg-config --cflags --libs lash-1.0')
-
-- if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform == "linux3":
-+ if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform == "linux3" or sys.platform > "freebsd":
- env.Append( LIBS = ["z"] )
- env.Append( LIBS = ["pthread"] )
-
-@@ -299,7 +301,7 @@
-
- for N in glob.glob('./data/i18n/hydrogen.*'):
- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
-- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
-+ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen', source="./data"))
-
- #add every img in ./data/img to the install list.
- os.path.walk("./data/img/",install_images,env)
-@@ -450,9 +452,9 @@
- Exit(1)
-
- #lrdf: categorizing of ladspa effects
--if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
-- print 'lrdf must be installed!'
-- Exit(1)
-+#if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
-+# print 'lrdf must be installed!'
-+# Exit(1)
-
-
- print ""
diff --git a/audio/hydrogen/files/patch-src__cli__CMakeLists.txt b/audio/hydrogen/files/patch-src__cli__CMakeLists.txt
new file mode 100644
index 000000000000..00d47c81e3d5
--- /dev/null
+++ b/audio/hydrogen/files/patch-src__cli__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./src/cli/CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930
++++ ./src/cli/CMakeLists.txt 2014-08-13 02:18:54.938462662 +0930
+@@ -6,6 +6,7 @@
+ ${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__core__src__IO__PortAudioDriver.h b/audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h
new file mode 100644
index 000000000000..895d4f0e2f3c
--- /dev/null
+++ b/audio/hydrogen/files/patch-src__core__src__IO__PortAudioDriver.h
@@ -0,0 +1,14 @@
+--- src/core/src/IO/PortAudioDriver.h.orig 2014-09-09 18:39:33 UTC
++++ src/core/src/IO/PortAudioDriver.h
+@@ -31,7 +31,11 @@
+ #ifdef H2CORE_HAVE_PORTAUDIO
+
+ #include <inttypes.h>
++#if defined(__FreeBSD__)
++#include <portaudio2/portaudio.h>
++#else
+ #include <portaudio.h>
++#endif
+
+ namespace H2Core
+ {
diff --git a/audio/hydrogen/files/patch-src__gui__CMakeLists.txt b/audio/hydrogen/files/patch-src__gui__CMakeLists.txt
new file mode 100644
index 000000000000..d735a4ea4560
--- /dev/null
+++ b/audio/hydrogen/files/patch-src__gui__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./src/gui/CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930
++++ ./src/gui/CMakeLists.txt 2014-08-13 02:18:55.069463221 +0930
+@@ -22,6 +22,7 @@
+ ${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
new file mode 100644
index 000000000000..ce7e3a965fe6
--- /dev/null
+++ b/audio/hydrogen/files/patch-src__player__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./src/player/CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930
++++ ./src/player/CMakeLists.txt 2014-08-13 02:18:55.093462388 +0930
+@@ -4,6 +4,7 @@
+ 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
new file mode 100644
index 000000000000..15f6630593d1
--- /dev/null
+++ b/audio/hydrogen/files/patch-src__synth__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./src/synth/CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930
++++ ./src/synth/CMakeLists.txt 2014-08-13 02:18:55.095462906 +0930
+@@ -4,6 +4,7 @@
+ 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 e6c57056e71f..8237e49239fe 100644
--- a/audio/hydrogen/pkg-plist
+++ b/audio/hydrogen/pkg-plist
@@ -1,109 +1,82 @@
+bin/h2cli
+bin/h2player
+bin/h2synth
bin/hydrogen
+include/hydrogen/audio_engine.h
+include/hydrogen/basics/adsr.h
+include/hydrogen/basics/drumkit.h
+include/hydrogen/basics/instrument_layer.h
+include/hydrogen/basics/instrument_list.h
+include/hydrogen/basics/instrument.h
+include/hydrogen/basics/note.h
+include/hydrogen/basics/pattern_list.h
+include/hydrogen/basics/pattern.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/ladspa.h
+include/hydrogen/fx/LadspaFX.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/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/logger.h
+include/hydrogen/midi_action.h
+include/hydrogen/midi_map.h
+include/hydrogen/object.h
+include/hydrogen/playlist.h
+include/hydrogen/Preferences.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.1.so
share/applications/hydrogen.desktop
-%%DATADIR%%/data/DefaultSong.h2song
%%DATADIR%%/data/click.wav
-%%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song
-%%DATADIR%%/data/demo_songs/GM_kit_Jazzy.h2song
+%%DATADIR%%/data/DefaultSong.h2song
%%DATADIR%%/data/demo_songs/GM_kit_demo1.h2song
%%DATADIR%%/data/demo_songs/GM_kit_demo2.h2song
%%DATADIR%%/data/demo_songs/GM_kit_demo3.h2song
+%%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song
+%%DATADIR%%/data/demo_songs/GM_kit_Jazzy.h2song
%%DATADIR%%/data/demo_songs/TR808kit-demo.h2song
%%DATADIR%%/data/demo_songs/tutorial_georgyporgy.h2song
-%%DATADIR%%/data/doc/Makefile
-%%DATADIR%%/data/doc/README.DOCUMENTATION.txt
-%%DATADIR%%/data/doc/img/AudioEngineInfoDialog.png
-%%DATADIR%%/data/doc/img/CreateNewPattern.png
-%%DATADIR%%/data/doc/img/Director.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/FX_send_knobs.png
-%%DATADIR%%/data/doc/img/GUI_Sections.svg
-%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5.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/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/PreferencesAudioSystem.png
-%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V2.png
-%%DATADIR%%/data/doc/img/PreferencesGeneral.png
-%%DATADIR%%/data/doc/img/PreferencesGeneral_V2.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.svg
-%%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_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_hh.png
+%%DATADIR%%/data/doc/img_tutorial/VerseBridge.png
%%DATADIR%%/data/doc/img/add_tag.png
%%DATADIR%%/data/doc/img/add_tempo_change.png
+%%DATADIR%%/data/doc/img/AudioEngineInfoDialog.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_Control.png
%%DATADIR%%/data/doc/img/background_Load.png
%%DATADIR%%/data/doc/img/background_Mode.png
%%DATADIR%%/data/doc/img/bg_topPanel.png
@@ -111,24 +84,24 @@ share/applications/hydrogen.desktop
%%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_hear.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_play_on.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_select.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
@@ -136,17 +109,63 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/doc/img/bypass_on.png
%%DATADIR%%/data/doc/img/bypass_over.png
%%DATADIR%%/data/doc/img/cpuload.png
+%%DATADIR%%/data/doc/img/CreateNewPattern.png
+%%DATADIR%%/data/doc/img/Director.png
%%DATADIR%%/data/doc/img/director.png
%%DATADIR%%/data/doc/img/downBtn_on.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/edit_off.png
+%%DATADIR%%/data/doc/img/Export_song.png
%%DATADIR%%/data/doc/img/fill_clear_pattern.png
+%%DATADIR%%/data/doc/img/FX_send_knobs.png
+%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5_v2.png
+%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5.png
%%DATADIR%%/data/doc/img/hearBtn_on.png
+%%DATADIR%%/data/doc/img/HearNewNotes.png
+%%DATADIR%%/data/doc/img/Hydrogen_0.9.5_gui.png
%%DATADIR%%/data/doc/img/instr_ed0.png
%%DATADIR%%/data/doc/img/instr_ed1.png
+%%DATADIR%%/data/doc/img/Instrument_General.png
+%%DATADIR%%/data/doc/img/Instrument_Layers.png
+%%DATADIR%%/data/doc/img/InstrumentMapping.png
%%DATADIR%%/data/doc/img/item_selected.png
%%DATADIR%%/data/doc/img/jack_transport.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_V2.png
+%%DATADIR%%/data/doc/img/MainToolbar.png
+%%DATADIR%%/data/doc/img/MainUI_tabbed.png
+%%DATADIR%%/data/doc/img/MeasureSettings.png
+%%DATADIR%%/data/doc/img/Midi_Actions.png
%%DATADIR%%/data/doc/img/midi_in.png
+%%DATADIR%%/data/doc/img/MidiIN_CPU.png
%%DATADIR%%/data/doc/img/mixer-instrrack_btn.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/newPatternBtn_on.png
%%DATADIR%%/data/doc/img/nl/DrumkitExport.png
%%DATADIR%%/data/doc/img/nl/DrumkitImport.png
@@ -166,37 +185,68 @@ share/applications/hydrogen.desktop
%%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/NoteKey.png
+%%DATADIR%%/data/doc/img/NoteOff_NoteLength.png
%%DATADIR%%/data/doc/img/pattern_properties.png
+%%DATADIR%%/data/doc/img/PatternEditor_DrumMode.png
+%%DATADIR%%/data/doc/img/PatternEditor_PianoMode.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_V2.png
+%%DATADIR%%/data/doc/img/PatternEditorInstr.png
+%%DATADIR%%/data/doc/img/PatternEditorPattern.png
+%%DATADIR%%/data/doc/img/PatternEditorRecording.png
+%%DATADIR%%/data/doc/img/PatternEditorSizeRes.png
+%%DATADIR%%/data/doc/img/PreferencesAppearance_V2.png
+%%DATADIR%%/data/doc/img/PreferencesAppearance.png
+%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V2.png
+%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V3.png
+%%DATADIR%%/data/doc/img/PreferencesAudioSystem.png
+%%DATADIR%%/data/doc/img/PreferencesGeneral_V2.png
+%%DATADIR%%/data/doc/img/PreferencesGeneral_V3.png
+%%DATADIR%%/data/doc/img/PreferencesGeneral.png
+%%DATADIR%%/data/doc/img/PreferencesMidiSystem_V2.png
+%%DATADIR%%/data/doc/img/PreferencesMidiSystem.png
%%DATADIR%%/data/doc/img/quantBtn_off.png
%%DATADIR%%/data/doc/img/quantBtn_on.png
+%%DATADIR%%/data/doc/img/Rec_button.png
%%DATADIR%%/data/doc/img/recBtn_on.png
+%%DATADIR%%/data/doc/img/Res.png
+%%DATADIR%%/data/doc/img/SampleEditor_V5.png
+%%DATADIR%%/data/doc/img/SampleEditor.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/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/songFuncBtn_on.png
+%%DATADIR%%/data/doc/img/SongLoop.png
+%%DATADIR%%/data/doc/img/SongOperations.png
+%%DATADIR%%/data/doc/img/Sound_Library_import.png
+%%DATADIR%%/data/doc/img/SoundLibrary.png
+%%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V3.png
+%%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V4.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/Tutorial2.h2song
+%%DATADIR%%/data/doc/img/TutorialEnd.png
+%%DATADIR%%/data/doc/img/TutorialStart.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/img/Virtual_patterns_menu.png
%%DATADIR%%/data/doc/infoSplash/aboutLogo.png
%%DATADIR%%/data/doc/infoSplash/news-070620.html
%%DATADIR%%/data/doc/infoSplash/news-081104.html
-%%DATADIR%%/data/doc/manual.docbook
-%%DATADIR%%/data/doc/manual.html
-%%DATADIR%%/data/doc/manual.pot
+%%DATADIR%%/data/doc/Makefile
%%DATADIR%%/data/doc/manual_ca.html
%%DATADIR%%/data/doc/manual_ca.po
%%DATADIR%%/data/doc/manual_en.html
@@ -208,16 +258,19 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/doc/manual_it.po
%%DATADIR%%/data/doc/manual_nl.html
%%DATADIR%%/data/doc/manual_nl.po
-%%DATADIR%%/data/doc/tutorial.docbook
-%%DATADIR%%/data/doc/tutorial.pot
+%%DATADIR%%/data/doc/manual.docbook
+%%DATADIR%%/data/doc/manual.html
+%%DATADIR%%/data/doc/manual.pot
+%%DATADIR%%/data/doc/MidiInstrumentMapping.ods
+%%DATADIR%%/data/doc/README.DOCUMENTATION.txt
+%%DATADIR%%/data/doc/TODO
%%DATADIR%%/data/doc/tutorial_en.html
-%%DATADIR%%/data/doc/tutorial_es.docbook
-%%DATADIR%%/data/doc/tutorial_es.html
-%%DATADIR%%/data/doc/tutorial_es.po
%%DATADIR%%/data/doc/tutorial_fr.html
%%DATADIR%%/data/doc/tutorial_fr.po
%%DATADIR%%/data/doc/tutorial_it.html
%%DATADIR%%/data/doc/tutorial_it.po
+%%DATADIR%%/data/doc/tutorial.docbook
+%%DATADIR%%/data/doc/tutorial.pot
%%DATADIR%%/data/drumkits/GMkit/clap_Dry_c.flac
%%DATADIR%%/data/drumkits/GMkit/cra_Jazz.flac
%%DATADIR%%/data/drumkits/GMkit/cra_Rock_a.flac
@@ -267,6 +320,8 @@ share/applications/hydrogen.desktop
%%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
@@ -283,8 +338,12 @@ share/applications/hydrogen.desktop
%%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/img/gray/about/aboutLogo.png
%%DATADIR%%/data/img/gray/audiFileBrowser/go-home.png
%%DATADIR%%/data/img/gray/audiFileBrowser/go-up.png
@@ -303,6 +362,9 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/drumkitManager/btn_save_off.png
%%DATADIR%%/data/img/gray/drumkitManager/btn_save_on.png
%%DATADIR%%/data/img/gray/drumkitManager/btn_save_over.png
+%%DATADIR%%/data/img/gray/h2-icon.svg
+%%DATADIR%%/data/img/gray/icon.icns
+%%DATADIR%%/data/img/gray/icon.svg
%%DATADIR%%/data/img/gray/icon16.png
%%DATADIR%%/data/img/gray/icon24.png
%%DATADIR%%/data/img/gray/icon32.png
@@ -317,10 +379,10 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_off.png
%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_on.png
%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_over.png
-%%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab.png
-%%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab_top.png
%%DATADIR%%/data/img/gray/instrumentEditor/instrument_show_off.png
%%DATADIR%%/data/img/gray/instrumentEditor/instrument_show_on.png
+%%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab_top.png
+%%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab.png
%%DATADIR%%/data/img/gray/instrumentEditor/layerTab.png
%%DATADIR%%/data/img/gray/instrumentEditor/layerTabnew.png
%%DATADIR%%/data/img/gray/instrumentEditor/library_show_off.png
@@ -332,6 +394,7 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/lcd/LCDLargeFontSet.png
%%DATADIR%%/data/img/gray/lcd/LCDLargeGrayFontSet.png
%%DATADIR%%/data/img/gray/lcd/LCDSmallBlueFontSet.png
+%%DATADIR%%/data/img/gray/lcd/LCDSmallFontSetRed.xcf
%%DATADIR%%/data/img/gray/lcd/LCDSmallGrayFontSet.png
%%DATADIR%%/data/img/gray/lcd/LCDSmallRedFontSet.png
%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_down_off.png
@@ -372,15 +435,15 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/mixerPanel/knob_images.png
%%DATADIR%%/data/img/gray/mixerPanel/led_trigger_off.png
%%DATADIR%%/data/img/gray/mixerPanel/led_trigger_on.png
-%%DATADIR%%/data/img/gray/mixerPanel/masterMixer_background.png
-%%DATADIR%%/data/img/gray/mixerPanel/masterMixer_leds.png
-%%DATADIR%%/data/img/gray/mixerPanel/masterMixerline_background.png
%%DATADIR%%/data/img/gray/mixerPanel/master_mute_off.png
%%DATADIR%%/data/img/gray/mixerPanel/master_mute_on.png
%%DATADIR%%/data/img/gray/mixerPanel/master_mute_over.png
+%%DATADIR%%/data/img/gray/mixerPanel/masterMixer_background.png
+%%DATADIR%%/data/img/gray/mixerPanel/masterMixer_leds.png
+%%DATADIR%%/data/img/gray/mixerPanel/masterMixerline_background.png
%%DATADIR%%/data/img/gray/mixerPanel/mixer_background.png
-%%DATADIR%%/data/img/gray/mixerPanel/mixerline_background.png
%%DATADIR%%/data/img/gray/mixerPanel/mixerline_background_on.png
+%%DATADIR%%/data/img/gray/mixerPanel/mixerline_background.png
%%DATADIR%%/data/img/gray/mixerPanel/mixerline_label_background.png
%%DATADIR%%/data/img/gray/mixerPanel/mixerline_text_background.png
%%DATADIR%%/data/img/gray/mixerPanel/panFader_background.png
@@ -405,6 +468,8 @@ share/applications/hydrogen.desktop
%%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
+%%DATADIR%%/data/img/gray/patternEditor/btn_drum_piano_off.png
+%%DATADIR%%/data/img/gray/patternEditor/btn_drum_piano_on.png
%%DATADIR%%/data/img/gray/patternEditor/btn_hear_off.png
%%DATADIR%%/data/img/gray/patternEditor/btn_hear_on.png
%%DATADIR%%/data/img/gray/patternEditor/btn_mute_off.png
@@ -418,14 +483,14 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/patternEditor/btn_solo_off.png
%%DATADIR%%/data/img/gray/patternEditor/btn_solo_on.png
%%DATADIR%%/data/img/gray/patternEditor/editor_top.png
-%%DATADIR%%/data/img/gray/patternEditor/instrument_line.png
%%DATADIR%%/data/img/gray/patternEditor/instrument_line_selected.png
+%%DATADIR%%/data/img/gray/patternEditor/instrument_line.png
%%DATADIR%%/data/img/gray/patternEditor/tickPosition.png
-%%DATADIR%%/data/img/gray/playerControlPanel/background.png
%%DATADIR%%/data/img/gray/playerControlPanel/background_BPM.png
%%DATADIR%%/data/img/gray/playerControlPanel/background_Control.png
%%DATADIR%%/data/img/gray/playerControlPanel/background_Jack.png
%%DATADIR%%/data/img/gray/playerControlPanel/background_Mode.png
+%%DATADIR%%/data/img/gray/playerControlPanel/background.png
%%DATADIR%%/data/img/gray/playerControlPanel/bbt_off.png
%%DATADIR%%/data/img/gray/playerControlPanel/bbt_on.png
%%DATADIR%%/data/img/gray/playerControlPanel/bc_off.old.png
@@ -498,9 +563,11 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/playerControlPanel/midiActivity_back.png
%%DATADIR%%/data/img/gray/playerControlPanel/midiActivity_on.png
%%DATADIR%%/data/img/gray/playerControlPanel/onoff.png
+%%DATADIR%%/data/img/gray/playerControlPanel/pattern_mode.png
%%DATADIR%%/data/img/gray/playerControlPanel/playlist_background_Control.png
%%DATADIR%%/data/img/gray/playerControlPanel/rubber_off.png
%%DATADIR%%/data/img/gray/playerControlPanel/rubber_on.png
+%%DATADIR%%/data/img/gray/playerControlPanel/song_mode.png
%%DATADIR%%/data/img/gray/playerControlPanel/statusLED_off.png
%%DATADIR%%/data/img/gray/playerControlPanel/statusLED_on.png
%%DATADIR%%/data/img/gray/preferencesDialog/rec.png
@@ -549,30 +616,20 @@ share/applications/hydrogen.desktop
%%DATADIR%%/data/img/gray/waveDisplay/detailsamplewavedisplay.png
%%DATADIR%%/data/img/gray/waveDisplay/mainsamplewavedisplay.png
%%DATADIR%%/data/img/gray/waveDisplay/targetsamplewavedisplay.png
-share/pixmaps/h2-icon.svg
-@dirrm %%DATADIR%%/data/img/gray/waveDisplay
-@dirrm %%DATADIR%%/data/img/gray/splash
-@dirrm %%DATADIR%%/data/img/gray/songEditor
-@dirrm %%DATADIR%%/data/img/gray/preferencesDialog
-@dirrm %%DATADIR%%/data/img/gray/playerControlPanel
-@dirrm %%DATADIR%%/data/img/gray/patternEditor
-@dirrm %%DATADIR%%/data/img/gray/mixerPanel
-@dirrm %%DATADIR%%/data/img/gray/lcd
-@dirrm %%DATADIR%%/data/img/gray/instrumentEditor
-@dirrm %%DATADIR%%/data/img/gray/drumkitManager
-@dirrm %%DATADIR%%/data/img/gray/audiFileBrowser
-@dirrm %%DATADIR%%/data/img/gray/about
-@dirrm %%DATADIR%%/data/img/gray
-@dirrm %%DATADIR%%/data/img
-@dirrm %%DATADIR%%/data/i18n
-@dirrm %%DATADIR%%/data/drumkits/TR808EmulationKit
-@dirrm %%DATADIR%%/data/drumkits/GMkit
-@dirrm %%DATADIR%%/data/drumkits
-@dirrm %%DATADIR%%/data/doc/infoSplash
-@dirrm %%DATADIR%%/data/doc/img_tutorial
-@dirrm %%DATADIR%%/data/doc/img/nl
-@dirrm %%DATADIR%%/data/doc/img
-@dirrm %%DATADIR%%/data/doc
-@dirrm %%DATADIR%%/data/demo_songs
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
+%%DATADIR%%/data/new_tutorial/img_tutorial/Bridge1_4th.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/Bridge3_3a_hh.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/C3_6+7.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/Intro4th.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/PatternBase1.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/PatternBase2.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/Riff1b.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/Riff1c.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/Riff1d.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/Verse8th.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/VerseAll.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/VerseBridge_hh.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/VerseBridge.png
+%%DATADIR%%/data/new_tutorial/img_tutorial/warn.png
+%%DATADIR%%/data/new_tutorial/tutorial_en.html
+%%DATADIR%%/data/xsd/drumkit_pattern.xsd
+%%DATADIR%%/data/xsd/drumkit.xsd