diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/hydrogen/Makefile | 58 | ||||
| -rw-r--r-- | audio/hydrogen/distinfo | 5 | ||||
| -rw-r--r-- | audio/hydrogen/files/patch-CMakeLists.txt | 25 | ||||
| -rw-r--r-- | audio/hydrogen/files/patch-cmake_FindHelper.cmake | 54 | ||||
| -rw-r--r-- | audio/hydrogen/pkg-plist | 334 |
5 files changed, 196 insertions, 280 deletions
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index 3c4cd2ad1c45..6b054a30b7c6 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hydrogen -PORTVERSION= 0.9.6.1 -PORTREVISION= 3 +PORTVERSION= 0.9.7 CATEGORIES= audio MAINTAINER= FreeBSD@ShaneWare.Biz @@ -11,18 +10,17 @@ COMMENT= Advanced drum machine LICENSE= GPLv2 -LIB_DEPENDS= libsndfile.so:audio/libsndfile - -BROKEN_powerpc64= fails to link: libicuuc.so. undefined reference to __cxa_throw_bad_array_new_length - CONFLICTS= hydrogen-devel-0.* +LIB_DEPENDS= libsndfile.so:audio/libsndfile \ + liblo.so:audio/liblo + USE_GITHUB= yes GH_ACCOUNT= hydrogen-music -USE_QT4= qmake_build moc_build rcc_build uic_build gui \ - network xml xmlpatterns -USES= cmake desktop-file-utils pkgconfig +USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig +USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ + gui network xml xmlpatterns OPTIONS_SINGLE= EXPORT OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR @@ -32,58 +30,46 @@ OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF EXPORT_DESC= Export support for drumkit -ALSA_CMAKE_ON= -DWANT_ALSA:BOOL=ON -ALSA_CMAKE_OFF= -DWANT_ALSA:BOOL=OFF +ALSA_CMAKE_BOOL= WANT_ALSA ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins -DEBUG_CMAKE_ON= -DWANT_DEBUG:BOOL=ON -DEBUG_CMAKE_OFF= -DWANT_DEBUG:BOOL=OFF +DEBUG_CMAKE_BOOL= WANT_DEBUG -JACK_CMAKE_ON= -DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON -JACK_CMAKE_OFF= -DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF +JACK_CMAKE_BOOL= WANT_JACK WANT_JACKSESSION JACK_LIB_DEPENDS= libjack.so:audio/jack -LADSPA_CMAKE_ON= -DWANT_LADSPA:BOOL=ON \ - -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa -LADSPA_CMAKE_OFF= -DWANT_LADSPA:BOOL=OFF +LADSPA_CMAKE_BOOL= WANT_LADSPA +LADSPA_CMAKE_ON= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa LADSPA_BUILD_DEPENDS= ladspa>=0:audio/ladspa LADSPA_RUN_DEPENDS= analyseplugin:audio/ladspa -LASH_CMAKE_ON= -DWANT_LASH:BOOL=ON -LASH_CMAKE_OFF= -DWANT_LASH:BOOL=OFF +LASH_CMAKE_BOOL= WANT_LASH LASH_LIB_DEPENDS= liblash.so:audio/lash LIBARCHIVE_DESC= LibArchive support -LIBARCHIVE_CMAKE_ON= -DWANT_LIBARCHIVE:BOOL=ON -LIBARCHIVE_CMAKE_OFF= -DWANT_LIBARCHIVE:BOOL=OFF +LIBARCHIVE_CMAKE_BOOL= WANT_LIBARCHIVE 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_CMAKE_BOOL= WANT_LIBTAR +LIBTAR_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/ LIBTAR_LIB_DEPENDS= libtar.so:devel/libtar -OSS_CMAKE_ON= -DWANT_OSS:BOOL=ON -OSS_CMAKE_OFF= -DWANT_OSS:BOOL=OFF +OSS_CMAKE_BOOL= WANT_OSS -PORTAUDIO_CMAKE_ON= -DWANT_PORTAUDIO:BOOL=ON -PORTAUDIO_CMAKE_OFF= -DWANT_PORTAUDIO:BOOL=OFF +PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PULSEAUDIO_CMAKE_ON= -DWANT_PULSEAUDIO:BOOL=ON -PULSEAUDIO_CMAKE_OFF= -DWANT_PULSEAUDIO:BOOL=OFF +PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so: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_CMAKE_BOOL= WANT_LRDF +RDF_CMAKE_ON= -DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2 RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf -TEST_CMAKE_ON= -DWANT_CPPUNIT:BOOL=ON -TEST_CMAKE_OFF= -DWANT_CPPUNIT:BOOL=OFF +TEST_CMAKE_BOOL= WANT_CPPUNIT TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit post-patch: diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo index cb09d5ce3ae7..1a4e997ea6fa 100644 --- a/audio/hydrogen/distinfo +++ b/audio/hydrogen/distinfo @@ -1,2 +1,3 @@ -SHA256 (hydrogen-music-hydrogen-0.9.6.1_GH0.tar.gz) = 94dadf433f0abbe7e0ae8e037726b3573f8b59abf118c9c084f06c561d56b66f -SIZE (hydrogen-music-hydrogen-0.9.6.1_GH0.tar.gz) = 6626629 +TIMESTAMP = 1478447235 +SHA256 (hydrogen-music-hydrogen-0.9.7_GH0.tar.gz) = 1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7 +SIZE (hydrogen-music-hydrogen-0.9.7_GH0.tar.gz) = 6424575 diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt index 3ac49392b401..aa2c370e23df 100644 --- a/audio/hydrogen/files/patch-CMakeLists.txt +++ b/audio/hydrogen/files/patch-CMakeLists.txt @@ -1,11 +1,7 @@ ---- CMakeLists.txt.orig 2014-09-09 18:39:33 UTC +--- CMakeLists.txt.orig 2016-11-05 18:52:50 UTC +++ CMakeLists.txt -@@ -100,12 +100,12 @@ ENDIF() - IF(APPLE) - SET(CMAKE_CXX_FLAGS "-O2") - ELSE() -- SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines") -+ SET(CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}") +@@ -111,9 +111,9 @@ IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "C + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines") ENDIF() -SET(CMAKE_CXX_FLAGS_RELEASE "") @@ -16,7 +12,7 @@ IF(APPLE) -@@ -178,7 +178,11 @@ FIND_LADSPA(LADSPA ladspa.h noise) +@@ -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 ) ELSE() @@ -29,16 +25,3 @@ ENDIF() FIND_HELPER(JACK jack jack/jack.h jack) -@@ -195,9 +199,9 @@ FIND_HELPER(PULSEAUDIO pulseaudio pulse/ - 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-cmake_FindHelper.cmake b/audio/hydrogen/files/patch-cmake_FindHelper.cmake deleted file mode 100644 index 23650b916640..000000000000 --- a/audio/hydrogen/files/patch-cmake_FindHelper.cmake +++ /dev/null @@ -1,54 +0,0 @@ -Sent upstream: https://github.com/hydrogen-music/hydrogen/pull/290 - -cmake: Call find_path and find_library even if pkg-config calls work. - -Instead of calling pkg_check_modules() with the same prefix as the calls -to find_library() and find_path(), pass PC_${prefix} to the former. - -This way, we are able to use the paths that might have been found by -pkg-config as hints to the find_library and find_path calls. Doing so -helps systems where the dependent libraries (libarchive, libsndfile etc) -are not in the default linker path, as the linker is now called with the -libraries' absolute path: - -c++ file1.o file2.o [...] -o hydrogen /usr/lib/libsndfile.so ... - -instead of - -c++ file1.o file2.o [...] -o hydrogen -lsndfile ... - -as the latter requires one to manually pass "-L/usr/local/lib" to CMake -when configuring Hydrogen. - -While here, use HINTS instead of PATHS when calling the find_*() -functions, as CMake's documentation says that "paths computed by system -introspection" should use HINTS, not PATHS, which is for hardcoded -paths. ---- cmake/FindHelper.cmake.orig 2014-09-09 18:39:33 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/pkg-plist b/audio/hydrogen/pkg-plist index 8237e49239fe..9f11a9eb3cfb 100644 --- a/audio/hydrogen/pkg-plist +++ b/audio/hydrogen/pkg-plist @@ -2,138 +2,100 @@ bin/h2cli bin/h2player bin/h2synth bin/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/lilypond/lilypond.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.1.so +lib/libhydrogen-core-0.9.7.so +man/man1/hydrogen.1.gz +share/appdata/hydrogen.appdata.xml 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 +104,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,59 +126,33 @@ 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/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/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/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/PreferencesAppearance_V2.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/PreferencesAudioSystem.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/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/PreferencesMidiSystem_V2.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/SampleEditor_V5.png %%DATADIR%%/data/doc/img/SongEditor.png %%DATADIR%%/data/doc/img/SongEditorAddLayer.png %%DATADIR%%/data/doc/img/SongEditorButtons.png @@ -227,50 +161,121 @@ share/applications/hydrogen.desktop %%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/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/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/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.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/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/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 @@ -349,19 +354,6 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/img/gray/audiFileBrowser/go-up.png %%DATADIR%%/data/img/gray/audiFileBrowser/player_play.png %%DATADIR%%/data/img/gray/audiFileBrowser/player_stop.png -%%DATADIR%%/data/img/gray/drumkitManager/background_options.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_export_off.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_export_on.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_export_over.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_import_off.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_import_on.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_import_over.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_new_off.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_new_on.png -%%DATADIR%%/data/img/gray/drumkitManager/btn_new_over.png -%%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 @@ -370,6 +362,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 +374,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 +422,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 +433,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 +481,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 +614,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 +627,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 |