diff --git a/audio/hydrogen-devel/Makefile b/audio/hydrogen-devel/Makefile index 54025e73d796..53a64bfa77c5 100644 --- a/audio/hydrogen-devel/Makefile +++ b/audio/hydrogen-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hydrogen -PORTVERSION= 0.9.6r2 -PORTREVISION= 2 +PORTVERSION= 0.9.7a CATEGORIES= audio PKGNAMESUFFIX= -devel @@ -11,36 +10,35 @@ MAINTAINER= FreeBSD@ShaneWare.Biz COMMENT= Advanced drum machine LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile CONFLICTS= hydrogen-0.* -LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile \ - libtar.so:${PORTSDIR}/devel/libtar - USE_GITHUB= yes GH_ACCOUNT= hydrogen-music -GH_PROJECT= hydrogen -GH_TAGNAME= 0.9.6-RC2 -DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} +GH_TAGNAME= 718b2652fb -MAJORVERSION= 0.9.6 -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 -USE_LDCONFIG= yes -LDFLAGS+= -L${LOCALBASE}/lib +USE_QT4= qmake_build moc_build rcc_build uic_build gui \ + network xml xmlpatterns +USES= cmake desktop-file-utils pkgconfig -OPTIONS_DEFINE= ALSA JACK LADSPA LASH LIBARCHIVE OSS PORTAUDIO RDF RUBBERBAND -OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF +OPTIONS_SINGLE= EXPORT +OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR +OPTIONS_DEFINE= ALSA DEBUG JACK LADSPA LASH OSS PORTAUDIO \ + PULSEAUDIO RDF RUBBERBAND TEST +OPTIONS_DEFAULT= JACK LADSPA LIBTAR OSS RDF + +EXPORT_DESC= Export support for drumkit 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 +DEBUG_CMAKE_ON= -DWANT_DEBUG:BOOL=ON +DEBUG_CMAKE_OFF= -DWANT_DEBUG:BOOL=OFF + 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 @@ -51,8 +49,7 @@ 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 \ - -DLASH_INCLUDE_DIR:STRING=${LOCALBASE}/include/lash-1.0 +LASH_CMAKE_ON= -DWANT_LASH:BOOL=ON LASH_CMAKE_OFF= -DWANT_LASH:BOOL=OFF LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash @@ -61,6 +58,12 @@ LIBARCHIVE_CMAKE_ON= -DWANT_LIBARCHIVE:BOOL=ON LIBARCHIVE_CMAKE_OFF= -DWANT_LIBARCHIVE:BOOL=OFF LIBARCHIVE_USES= libarchive +LIBTAR_DESC= Libtar support +LIBTAR_CMAKE_ON= -DWANT_LIBTAR:BOOL=ON \ + -DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/ +LIBTAR_CMAKE_OFF= -DWANT_LIBTAR:BOOL=OFF +LIBTAR_LIB_DEPENDS= libtar.so:${PORTSDIR}/devel/libtar + OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF @@ -68,11 +71,15 @@ PORTAUDIO_CMAKE_ON= -DWANT_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DWANT_PORTAUDIO:BOOL=OFF PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio +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 +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 -RDF_CXXFLAGS= -I${LOCALBASE}/include/raptor2 # using librubberband is experimental and current versions have bad timing # installing the rubberband cli tool still works as before @@ -82,4 +89,15 @@ RUBBERBAND_CMAKE_ON= -DWANT_RUBBERBAND:BOOL=ON \ RUBBERBAND_CMAKE_OFF= -DWANT_RUBBERBAND:BOOL=OFF RUBBERBAND_LIB_DEPENDS= librubberband.so:${PORTSDIR}/audio/rubberband +TEST_CMAKE_ON= -DWANT_CPPUNIT:BOOL=ON +TEST_CMAKE_OFF= -DWANT_CPPUNIT:BOOL=OFF +TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit + +post-patch: + @${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \ + ${WRKSRC}/CMakeLists.txt + +test: build + cd ${WRKSRC} && ./src/tests/tests + .include diff --git a/audio/hydrogen-devel/distinfo b/audio/hydrogen-devel/distinfo index 800fe576b976..46061fbb7c08 100644 --- a/audio/hydrogen-devel/distinfo +++ b/audio/hydrogen-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (hydrogen-music-hydrogen-0.9.6r2-0.9.6-RC2_GH0.tar.gz) = c2f825aae96fb44d9739e0b00a0d3f9acfed8ae612cfe53a99c7e89e1d5b83b0 -SIZE (hydrogen-music-hydrogen-0.9.6r2-0.9.6-RC2_GH0.tar.gz) = 6625489 +SHA256 (hydrogen-music-hydrogen-0.9.7a-718b2652fb_GH0.tar.gz) = bfdf0cb8c171d50ecfdd3c652f6d3a4d860feedc514e5de506046a7b89b86adf +SIZE (hydrogen-music-hydrogen-0.9.7a-718b2652fb_GH0.tar.gz) = 6545382 diff --git a/audio/hydrogen-devel/files/patch-CMakeLists.txt b/audio/hydrogen-devel/files/patch-CMakeLists.txt index e03790a72ee7..e43b6f3f9e35 100644 --- a/audio/hydrogen-devel/files/patch-CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-CMakeLists.txt @@ -1,16 +1,6 @@ ---- ./CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930 -+++ ./CMakeLists.txt 2014-08-13 02:18:54.653463918 +0930 -@@ -21,8 +21,7 @@ - SET(VERSION_PATCH "6") - SET(VERSION_SUFFIX "RC2") - --#SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -- -+SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") - - IF(VERSION_SUFFIX) - SET(DISPLAY_VERSION "${VERSION}-${VERSION_SUFFIX}") -@@ -93,12 +92,12 @@ +--- CMakeLists.txt.orig 2015-09-07 03:44:01 UTC ++++ CMakeLists.txt +@@ -107,12 +107,12 @@ ENDIF() IF(APPLE) SET(CMAKE_CXX_FLAGS "-O2") ELSE() @@ -26,24 +16,12 @@ IF(APPLE) -@@ -114,9 +113,9 @@ - MANDATORY_PKG(LIBSNDFILE) +@@ -199,6 +199,8 @@ FIND_HELPER(NSMSESSION liblo lo/lo.h lo) - # TODO remove data from path --SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data") -+SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen-devel/data") - # TODO remove data from path, could be .config/hydrogen --SET(USR_DATA_PATH ".hydrogen/data") -+SET(USR_DATA_PATH ".hydrogen-devel/data") - IF(WIN32) - SET(WANT_JACK FALSE) - SET(Threads_PATH "C:/Program Files/GnuWin32") -@@ -167,7 +166,7 @@ - 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 ) -+FIND_HELPER(OSS oss sys/soundcard.h c ) - FIND_HELPER(JACK jack jack/jack.h jack) - FIND_HELPER(JACKSESSION jack jack/session.h jack) - IF(APPLE) + 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 ) + ENDIF() diff --git a/audio/hydrogen-devel/files/patch-cmake_FindHelper.cmake b/audio/hydrogen-devel/files/patch-cmake_FindHelper.cmake new file mode 100644 index 000000000000..8794e3cba0a4 --- /dev/null +++ b/audio/hydrogen-devel/files/patch-cmake_FindHelper.cmake @@ -0,0 +1,28 @@ +--- cmake/FindHelper.cmake.orig 2015-08-31 19:04:48 UTC ++++ cmake/FindHelper.cmake +@@ -23,7 +23,7 @@ macro(FIND_HELPER prefix pkg_name header + FIND_PACKAGE(PkgConfig) + endif() + if(PKG_CONFIG_FOUND) +- pkg_check_modules(${prefix} ${pkg_name}) ++ pkg_check_modules(PC_${prefix} ${pkg_name}) + #MESSAGE(STATUS " LDFLAGS ${${prefix}_LDFLAGS}" ) + #MESSAGE(STATUS " CFLAGS ${${prefix}_CFLAGS}" ) + #MESSAGE(STATUS " INCLUDEDIRS ${${prefix}_INCLUDE_DIRS}" ) +@@ -36,12 +36,14 @@ macro(FIND_HELPER prefix pkg_name header + + find_path(${prefix}_INCLUDE_DIR + NAMES ${header} +- PATHS ${${prefix}_INCLUDE_DIRS} ${${prefix}_INCLUDEDIR} ${${prefix}_INCLUDE_PATHS} ENV ${prefix}_INCLUDE ++ HINTS ${PC_${prefix}_INCLUDE_DIRS} ${PC_${prefix}_INCLUDEDIR} ${PC_${prefix}_INCLUDE_PATHS} ++ ENV ${prefix}_INCLUDE + ) + + find_library(${prefix}_LIBRARIES + NAMES ${lib} +- PATHS ${${prefix}_LIBDIR} ${${prefix}_LIBRARY_DIRS} ${${prefix}_LIB_PATHS} ENV ${prefix}_PATH ++ HINTS ${PC_${prefix}_LIBDIR} ${PC_${prefix}_LIBRARY_DIRS} ${PC_${prefix}_LIB_PATHS} ++ ENV ${prefix}_PATH + ) + endif() + diff --git a/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt index 00d47c81e3d5..966e4943176d 100644 --- a/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-src__cli__CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./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 @@ +--- src/cli/CMakeLists.txt.orig 2015-08-31 19:04:48 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} diff --git a/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt index 5fc6f19ae867..7afab1095a02 100644 --- a/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-src__core__CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./src/core/CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930 -+++ ./src/core/CMakeLists.txt 2014-08-13 02:21:24.615462875 +0930 -@@ -9,6 +9,7 @@ +--- src/core/CMakeLists.txt.orig 2015-08-31 19:04:48 UTC ++++ src/core/CMakeLists.txt +@@ -9,6 +9,7 @@ ADD_LIBRARY( hydrogen-core-${VERSION} ${ INCLUDE_DIRECTORIES( include ${CMAKE_SOURCE_DIR}/include # regular headers ${CMAKE_CURRENT_BINARY_DIR}/include # generated config.h @@ -8,7 +8,7 @@ ${QT_INCLUDES} ${LIBTAR_INCLUDE_DIR} ${LIBARCHIVE_INCLUDE_DIR} -@@ -16,7 +17,6 @@ +@@ -16,7 +17,6 @@ INCLUDE_DIRECTORIES( include ${ALSA_INCLUDE_DIR} ${OSS_INCLUDE_DIR} ${JACK_INCLUDE_DIR} diff --git a/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h b/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h index cbb00a489f48..a26683a14f04 100644 --- a/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h +++ b/audio/hydrogen-devel/files/patch-src__core__include__hydrogen__LashClient.h @@ -1,5 +1,5 @@ ---- ./src/core/include/hydrogen/LashClient.h.orig 2014-06-19 06:38:04.000000000 +0930 -+++ ./src/core/include/hydrogen/LashClient.h 2014-08-13 02:18:54.984463002 +0930 +--- src/core/include/hydrogen/LashClient.h.orig 2015-08-31 19:04:48 UTC ++++ src/core/include/hydrogen/LashClient.h @@ -27,7 +27,7 @@ #ifndef LASH_CLIENT #define LASH_CLIENT diff --git a/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt index d735a4ea4560..522d3e9c0066 100644 --- a/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-src__gui__CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./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 @@ +--- src/gui/CMakeLists.txt.orig 2015-08-31 19:04:48 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} diff --git a/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt index ce7e3a965fe6..6372500b97ce 100644 --- a/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-src__player__CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./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 @@ +--- src/player/CMakeLists.txt.orig 2015-08-31 19:04:48 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 diff --git a/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt b/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt index 15f6630593d1..62e9a830ffbd 100644 --- a/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-src__synth__CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./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 @@ +--- src/synth/CMakeLists.txt.orig 2015-08-31 19:04:48 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 diff --git a/audio/hydrogen-devel/pkg-plist b/audio/hydrogen-devel/pkg-plist index 470f1517f46a..c981a99ba5de 100644 --- a/audio/hydrogen-devel/pkg-plist +++ b/audio/hydrogen-devel/pkg-plist @@ -1,139 +1,99 @@ -bin/h2cli -bin/h2player -bin/h2synth -bin/hydrogen +%%QT_BINDIR%%/h2cli +%%QT_BINDIR%%/h2player +%%QT_BINDIR%%/h2synth +%%QT_BINDIR%%/hydrogen +include/hydrogen/IO/AlsaAudioDriver.h +include/hydrogen/IO/AlsaMidiDriver.h +include/hydrogen/IO/AudioOutput.h +include/hydrogen/IO/CoreAudioDriver.h +include/hydrogen/IO/CoreMidiDriver.h +include/hydrogen/IO/DiskWriterDriver.h +include/hydrogen/IO/FakeDriver.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 +include/hydrogen/IO/NullDriver.h +include/hydrogen/IO/OssDriver.h +include/hydrogen/IO/PortAudioDriver.h +include/hydrogen/IO/PortMidiDriver.h +include/hydrogen/IO/PulseAudioDriver.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/drumkit_component.h +include/hydrogen/basics/instrument.h +include/hydrogen/basics/instrument_component.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/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/ladspa.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/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/nsm.h +include/hydrogen/nsm_client.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/timeline.h include/hydrogen/version.h -lib/libhydrogen-core-0.9.6.so +lib/libhydrogen-core-0.9.7.so share/applications/hydrogen.desktop -%%DATADIR%%/data/click.wav %%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/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/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/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/background_BPM.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 -%%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_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_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_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 -%%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/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/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/instr_ed0.png -%%DATADIR%%/data/doc/img/instr_ed1.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/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 @@ -142,14 +102,12 @@ share/applications/hydrogen.desktop %%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/MainToolbar_V2.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/Midi_Actions.png %%DATADIR%%/data/doc/img/Mixer.png %%DATADIR%%/data/doc/img/MixerDelay.png %%DATADIR%%/data/doc/img/MixerFX.png @@ -166,6 +124,99 @@ share/applications/hydrogen.desktop %%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/director.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 @@ -185,92 +236,45 @@ 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/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/Makefile -%%DATADIR%%/data/doc/manual_ca.html -%%DATADIR%%/data/doc/manual_ca.po -%%DATADIR%%/data/doc/manual_en.html -%%DATADIR%%/data/doc/manual_es.html -%%DATADIR%%/data/doc/manual_es.po -%%DATADIR%%/data/doc/manual_fr.html -%%DATADIR%%/data/doc/manual_fr.po -%%DATADIR%%/data/doc/manual_it.html -%%DATADIR%%/data/doc/manual_it.po -%%DATADIR%%/data/doc/manual_nl.html -%%DATADIR%%/data/doc/manual_nl.po +%%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/MidiInstrumentMapping.ods -%%DATADIR%%/data/doc/README.DOCUMENTATION.txt -%%DATADIR%%/data/doc/TODO -%%DATADIR%%/data/doc/tutorial_en.html -%%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/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 @@ -370,6 +374,9 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/img/gray/icon32.png %%DATADIR%%/data/img/gray/icon48.png %%DATADIR%%/data/img/gray/icon64.png +%%DATADIR%%/data/img/gray/instrumentEditor/btn_dropdown_off.png +%%DATADIR%%/data/img/gray/instrumentEditor/btn_dropdown_on.png +%%DATADIR%%/data/img/gray/instrumentEditor/btn_dropdown_over.png %%DATADIR%%/data/img/gray/instrumentEditor/bypass_off.png %%DATADIR%%/data/img/gray/instrumentEditor/bypass_on.png %%DATADIR%%/data/img/gray/instrumentEditor/bypass_over.png @@ -379,12 +386,14 @@ 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_new.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/layerTabsupernew.png %%DATADIR%%/data/img/gray/instrumentEditor/library_show_off.png %%DATADIR%%/data/img/gray/instrumentEditor/library_show_on.png %%DATADIR%%/data/img/gray/instrumentEditor/loadLayer_off.png @@ -425,6 +434,7 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/img/gray/mixerPanel/bypass_off.png %%DATADIR%%/data/img/gray/mixerPanel/bypass_on.png %%DATADIR%%/data/img/gray/mixerPanel/bypass_over.png +%%DATADIR%%/data/img/gray/mixerPanel/componentmixerline_background.png %%DATADIR%%/data/img/gray/mixerPanel/edit_off.png %%DATADIR%%/data/img/gray/mixerPanel/edit_on.png %%DATADIR%%/data/img/gray/mixerPanel/edit_over.png @@ -435,15 +445,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/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/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/mixer_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_background_on.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 @@ -483,14 +493,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_selected.png %%DATADIR%%/data/img/gray/patternEditor/instrument_line.png +%%DATADIR%%/data/img/gray/patternEditor/instrument_line_selected.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 @@ -616,6 +626,8 @@ 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 +%%DATADIR%%/data/img/h2-icon.bmp +%%DATADIR%%/data/img/h2-icon.ico %%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 @@ -627,9 +639,9 @@ share/applications/hydrogen.desktop %%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/VerseBridge_hh.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 +%%DATADIR%%/data/xsd/drumkit_pattern.xsd