From 7538f14afa30f124b412118ec9cab13ec2e58d0d Mon Sep 17 00:00:00 2001 From: Igor Korsukov Date: Tue, 7 Apr 2020 10:52:09 +0200 Subject: [PATCH] moved all imports/exports to importexport module --- CMakeLists.txt | 4 +- bww2mxml/CMakeLists.txt | 34 ++----- importexport/CMakeLists.txt | 90 +++++++++++++++++++ importexport/bb/bb.cmake | 4 + {mscore => importexport/bb}/bb.cpp | 0 {mscore => importexport/bb}/bb.h | 0 importexport/bww/bww.cmake | 4 + {mscore => importexport/bww}/importbww.cpp | 8 +- {bww2mxml => importexport/bww}/lexer.cpp | 0 {bww2mxml => importexport/bww}/lexer.h | 0 {bww2mxml => importexport/bww}/parser.cpp | 0 {bww2mxml => importexport/bww}/parser.h | 0 {bww2mxml => importexport/bww}/symbols.cpp | 0 {bww2mxml => importexport/bww}/symbols.h | 0 {bww2mxml => importexport/bww}/writer.cpp | 0 {bww2mxml => importexport/bww}/writer.h | 0 importexport/capella/capella.cmake | 13 +++ {mscore => importexport/capella}/capella.cpp | 0 {mscore => importexport/capella}/capella.h | 1 - {mscore => importexport/capella}/capxml.cpp | 0 importexport/guitarpro/guitarpro.cmake | 4 + .../guitarpro}/importgtp-gp4.cpp | 2 +- .../guitarpro}/importgtp-gp5.cpp | 2 +- .../guitarpro}/importgtp-gp6.cpp | 2 +- .../guitarpro}/importgtp-gp7.cpp | 0 .../guitarpro}/importgtp.cpp | 6 +- .../guitarpro}/importgtp.h | 0 .../guitarpro}/importptb.cpp | 0 .../guitarpro}/importptb.h | 0 .../midiexport}/exportmidi.cpp | 8 +- .../midiexport}/exportmidi.h | 0 importexport/midiexport/midiexport.cmake | 5 ++ .../midiimport}/importmidi.cpp | 0 .../midiimport}/importmidi_beat.cpp | 0 .../midiimport}/importmidi_beat.h | 0 .../midiimport}/importmidi_chord.cpp | 0 .../midiimport}/importmidi_chord.h | 0 .../midiimport}/importmidi_chordname.cpp | 0 .../midiimport}/importmidi_chordname.h | 0 .../midiimport}/importmidi_clef.cpp | 0 .../midiimport}/importmidi_clef.h | 0 .../midiimport}/importmidi_drum.cpp | 0 .../midiimport}/importmidi_drum.h | 0 .../midiimport}/importmidi_fraction.cpp | 0 .../midiimport}/importmidi_fraction.h | 0 .../midiimport}/importmidi_inner.cpp | 0 .../midiimport}/importmidi_inner.h | 0 .../midiimport}/importmidi_instrument.cpp | 0 .../midiimport}/importmidi_instrument.h | 0 .../midiimport}/importmidi_key.cpp | 0 .../midiimport}/importmidi_key.h | 0 .../midiimport}/importmidi_lrhand.cpp | 0 .../midiimport}/importmidi_lrhand.h | 0 .../midiimport}/importmidi_lyrics.cpp | 0 .../midiimport}/importmidi_lyrics.h | 0 .../midiimport}/importmidi_meter.cpp | 0 .../midiimport}/importmidi_meter.h | 0 .../midiimport}/importmidi_model.cpp | 0 .../midiimport}/importmidi_model.h | 0 .../midiimport}/importmidi_operation.h | 0 .../midiimport}/importmidi_operations.cpp | 0 .../midiimport}/importmidi_operations.h | 0 .../midiimport}/importmidi_quant.cpp | 0 .../midiimport}/importmidi_quant.h | 0 .../midiimport}/importmidi_simplify.cpp | 0 .../midiimport}/importmidi_simplify.h | 0 .../midiimport}/importmidi_swing.cpp | 0 .../midiimport}/importmidi_swing.h | 0 .../midiimport}/importmidi_tempo.cpp | 0 .../midiimport}/importmidi_tempo.h | 0 .../midiimport}/importmidi_tie.cpp | 0 .../midiimport}/importmidi_tie.h | 0 .../midiimport}/importmidi_tuplet.cpp | 0 .../midiimport}/importmidi_tuplet.h | 0 .../midiimport}/importmidi_tuplet_detect.cpp | 0 .../midiimport}/importmidi_tuplet_detect.h | 0 .../midiimport}/importmidi_tuplet_filter.cpp | 0 .../midiimport}/importmidi_tuplet_filter.h | 0 .../midiimport}/importmidi_tuplet_tonotes.cpp | 0 .../midiimport}/importmidi_tuplet_tonotes.h | 0 .../midiimport}/importmidi_tuplet_voice.cpp | 0 .../midiimport}/importmidi_tuplet_voice.h | 0 .../midiimport}/importmidi_voice.cpp | 0 .../midiimport}/importmidi_voice.h | 0 importexport/midiimport/midiimport.cmake | 14 +++ importexport/musedata/musedata.cmake | 4 + .../musedata}/musedata.cpp | 0 {mscore => importexport/musedata}/musedata.h | 0 .../musicxml}/exportxml.cpp | 14 +-- .../musicxml}/importmxml.cpp | 3 +- .../musicxml}/importmxml.h | 0 .../musicxml}/importmxmllogger.cpp | 0 .../musicxml}/importmxmllogger.h | 0 .../musicxml}/importmxmlnoteduration.cpp | 0 .../musicxml}/importmxmlnoteduration.h | 0 .../musicxml}/importmxmlnotepitch.cpp | 0 .../musicxml}/importmxmlnotepitch.h | 0 .../musicxml}/importmxmlpass1.cpp | 3 +- .../musicxml}/importmxmlpass1.h | 0 .../musicxml}/importmxmlpass2.cpp | 3 +- .../musicxml}/importmxmlpass2.h | 0 .../musicxml}/importxml.cpp | 0 .../musicxml}/importxmlfirstpass.cpp | 0 .../musicxml}/importxmlfirstpass.h | 0 importexport/musicxml/musicxml.cmake | 4 + {mscore => importexport/musicxml}/musicxml.h | 0 .../musicxml}/musicxmlfonthandler.cpp | 0 .../musicxml}/musicxmlfonthandler.h | 0 .../musicxml}/musicxmlsupport.cpp | 2 +- .../musicxml}/musicxmlsupport.h | 0 {mscore => importexport/ove}/importove.cpp | 5 +- importexport/ove/ove.cmake | 4 + {mscore => importexport/ove}/ove.cpp | 0 {mscore => importexport/ove}/ove.h | 0 mscore/CMakeLists.txt | 68 +++++--------- mscore/file.cpp | 4 +- .../importmidi_delegate.cpp | 0 .../importmidi_delegate.h | 0 .../importmidi_panel.cpp | 18 ++-- .../importmidi_panel.h | 0 .../importmidi_panel.ui | 2 +- .../importmidi_view.cpp | 0 .../importmidi_view.h | 0 mscore/musescore.cpp | 8 +- mtest/CMakeLists.txt | 77 ++++------------ mtest/libmscore/midi/tst_midi.cpp | 2 +- 126 files changed, 251 insertions(+), 171 deletions(-) create mode 100644 importexport/CMakeLists.txt create mode 100644 importexport/bb/bb.cmake rename {mscore => importexport/bb}/bb.cpp (100%) rename {mscore => importexport/bb}/bb.h (100%) create mode 100644 importexport/bww/bww.cmake rename {mscore => importexport/bww}/importbww.cpp (99%) rename {bww2mxml => importexport/bww}/lexer.cpp (100%) rename {bww2mxml => importexport/bww}/lexer.h (100%) rename {bww2mxml => importexport/bww}/parser.cpp (100%) rename {bww2mxml => importexport/bww}/parser.h (100%) rename {bww2mxml => importexport/bww}/symbols.cpp (100%) rename {bww2mxml => importexport/bww}/symbols.h (100%) rename {bww2mxml => importexport/bww}/writer.cpp (100%) rename {bww2mxml => importexport/bww}/writer.h (100%) create mode 100644 importexport/capella/capella.cmake rename {mscore => importexport/capella}/capella.cpp (100%) rename {mscore => importexport/capella}/capella.h (99%) rename {mscore => importexport/capella}/capxml.cpp (100%) create mode 100644 importexport/guitarpro/guitarpro.cmake rename {mscore => importexport/guitarpro}/importgtp-gp4.cpp (99%) rename {mscore => importexport/guitarpro}/importgtp-gp5.cpp (99%) rename {mscore => importexport/guitarpro}/importgtp-gp6.cpp (99%) rename {mscore => importexport/guitarpro}/importgtp-gp7.cpp (100%) rename {mscore => importexport/guitarpro}/importgtp.cpp (99%) rename {mscore => importexport/guitarpro}/importgtp.h (100%) rename {mscore => importexport/guitarpro}/importptb.cpp (100%) rename {mscore => importexport/guitarpro}/importptb.h (100%) rename {mscore => importexport/midiexport}/exportmidi.cpp (99%) rename {mscore => importexport/midiexport}/exportmidi.h (100%) create mode 100644 importexport/midiexport/midiexport.cmake rename {mscore/importmidi => importexport/midiimport}/importmidi.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_beat.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_beat.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_chord.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_chord.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_chordname.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_chordname.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_clef.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_clef.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_drum.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_drum.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_fraction.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_fraction.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_inner.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_inner.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_instrument.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_instrument.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_key.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_key.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_lrhand.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_lrhand.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_lyrics.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_lyrics.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_meter.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_meter.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_model.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_model.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_operation.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_operations.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_operations.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_quant.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_quant.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_simplify.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_simplify.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_swing.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_swing.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tempo.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tempo.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tie.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tie.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_detect.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_detect.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_filter.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_filter.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_tonotes.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_tonotes.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_voice.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_tuplet_voice.h (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_voice.cpp (100%) rename {mscore/importmidi => importexport/midiimport}/importmidi_voice.h (100%) create mode 100644 importexport/midiimport/midiimport.cmake create mode 100644 importexport/musedata/musedata.cmake rename {mscore => importexport/musedata}/musedata.cpp (100%) rename {mscore => importexport/musedata}/musedata.h (100%) rename {mscore => importexport/musicxml}/exportxml.cpp (99%) rename {mscore => importexport/musicxml}/importmxml.cpp (98%) rename {mscore => importexport/musicxml}/importmxml.h (100%) rename {mscore => importexport/musicxml}/importmxmllogger.cpp (100%) rename {mscore => importexport/musicxml}/importmxmllogger.h (100%) rename {mscore => importexport/musicxml}/importmxmlnoteduration.cpp (100%) rename {mscore => importexport/musicxml}/importmxmlnoteduration.h (100%) rename {mscore => importexport/musicxml}/importmxmlnotepitch.cpp (100%) rename {mscore => importexport/musicxml}/importmxmlnotepitch.h (100%) rename {mscore => importexport/musicxml}/importmxmlpass1.cpp (99%) rename {mscore => importexport/musicxml}/importmxmlpass1.h (100%) rename {mscore => importexport/musicxml}/importmxmlpass2.cpp (99%) rename {mscore => importexport/musicxml}/importmxmlpass2.h (100%) rename {mscore => importexport/musicxml}/importxml.cpp (100%) rename {mscore => importexport/musicxml}/importxmlfirstpass.cpp (100%) rename {mscore => importexport/musicxml}/importxmlfirstpass.h (100%) create mode 100644 importexport/musicxml/musicxml.cmake rename {mscore => importexport/musicxml}/musicxml.h (100%) rename {mscore => importexport/musicxml}/musicxmlfonthandler.cpp (100%) rename {mscore => importexport/musicxml}/musicxmlfonthandler.h (100%) rename {mscore => importexport/musicxml}/musicxmlsupport.cpp (99%) rename {mscore => importexport/musicxml}/musicxmlsupport.h (100%) rename {mscore => importexport/ove}/importove.cpp (99%) create mode 100644 importexport/ove/ove.cmake rename {mscore => importexport/ove}/ove.cpp (100%) rename {mscore => importexport/ove}/ove.h (100%) rename mscore/{importmidi => importmidi_ui}/importmidi_delegate.cpp (100%) rename mscore/{importmidi => importmidi_ui}/importmidi_delegate.h (100%) rename mscore/{importmidi => importmidi_ui}/importmidi_panel.cpp (97%) rename mscore/{importmidi => importmidi_ui}/importmidi_panel.h (100%) rename mscore/{importmidi => importmidi_ui}/importmidi_panel.ui (99%) rename mscore/{importmidi => importmidi_ui}/importmidi_view.cpp (100%) rename mscore/{importmidi => importmidi_ui}/importmidi_view.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a6dfd9662..6e7d3537ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -787,8 +787,9 @@ if (BUILD_TELEMETRY_MODULE) add_subdirectory(telemetry) add_subdirectory(thirdparty/google_analytics) endif (BUILD_TELEMETRY_MODULE) -add_subdirectory(global) +add_subdirectory(global) +add_subdirectory(importexport) add_subdirectory(mscore) add_subdirectory(main) @@ -815,7 +816,6 @@ add_subdirectory(synthesizer) subdirs( awl bww2mxml share midi audiofile fluid libmscore - thirdparty/rtf2html thirdparty/beatroot thirdparty/qzip ) diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt index be9effa317..ab2d871083 100644 --- a/bww2mxml/CMakeLists.txt +++ b/bww2mxml/CMakeLists.txt @@ -26,30 +26,22 @@ else (APPLE) set(INCS "") endif (APPLE) -add_library(bww STATIC - ${INCS} - lexer.cpp - parser.cpp - symbols.cpp - ) +set (BWW_DIR ${PROJECT_SOURCE_DIR}/importexport/bww) -if (MSVC) - set_target_properties ( - bww - PROPERTIES - COMPILE_FLAGS "${PCH_INCLUDE}" +include_directories( + ${BWW_DIR} ) -endif (MSVC) if (NOT MINGW AND NOT APPLE AND NOT MSVC) add_executable(bww2mxml ${INCS} - lexer.cpp + ${BWW_SRC} main.cpp mxmlwriter.cpp - parser.cpp - symbols.cpp - writer.cpp + ${BWW_DIR}/writer.cpp + ${BWW_DIR}/lexer.cpp + ${BWW_DIR}/parser.cpp + ${BWW_DIR}/symbols.cpp ) set_target_properties ( @@ -65,13 +57,3 @@ if (NOT MINGW AND NOT APPLE AND NOT MSVC) ADD_DEPENDENCIES(bww2mxml mops2) endif (NOT MINGW AND NOT APPLE AND NOT MSVC) -xcode_pch(bww all) - -# Use MSVC pre-compiled headers -vstudio_pch( bww ) - -# MSVC does not depend on mops1 & mops2 for PCH -if (NOT MSVC) - ADD_DEPENDENCIES(bww mops1) - ADD_DEPENDENCIES(bww mops2) -endif (NOT MSVC) diff --git a/importexport/CMakeLists.txt b/importexport/CMakeLists.txt new file mode 100644 index 0000000000..65e108f6dc --- /dev/null +++ b/importexport/CMakeLists.txt @@ -0,0 +1,90 @@ +#============================================================================= +# MuseScore +# Music Composition & Notation +# +# Copyright (C) 2020 MuseScore BVBA and others +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#============================================================================= + +set(MODULE importexport) + +include (${PROJECT_SOURCE_DIR}/build/gch.cmake) + +include_directories( + ${PROJECT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +if (NOT MSVC) + set(_all_h_file "${PROJECT_BINARY_DIR}/all.h") +else (NOT MSVC) + set(_all_h_file "${PROJECT_SOURCE_DIR}/all.h") +endif (NOT MSVC) + + +include(${CMAKE_CURRENT_LIST_DIR}/musicxml/musicxml.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/midiimport/midiimport.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/midiexport/midiexport.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/ove/ove.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/guitarpro/guitarpro.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/musedata/musedata.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/bb/bb.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/capella/capella.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/bww/bww.cmake) + +add_library ( + ${MODULE} STATIC + ${_all_h_file} + ${PCH} + ${MUSICXML_SRC} + ${MIDIIMPORT_SRC} + ${MIDIEXPORT_SRC} + ${OVE_SRC} + ${GUITARPRO_SRC} + ${MUSEDATA_SRC} + ${BB_SRC} + ${CAPELLA_SRC} + ${BWW_SRC} + ) + +target_link_libraries(${MODULE} + ${QT_LIBRARIES} + midi # for midi import + ) + +if (NOT MSVC) + set_target_properties ( + ${MODULE} + PROPERTIES + COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch" + ) +else (NOT MSVC) + set_target_properties ( + ${MODULE} + PROPERTIES + COMPILE_FLAGS "${PCH_INCLUDE}" + ) +endif (NOT MSVC) + +xcode_pch(${MODULE} all) + +# Use MSVC pre-compiled headers +vstudio_pch( ${MODULE} ) + +# MSVC does not depend on mops1 & mops2 for PCH +if (NOT MSVC) + ADD_DEPENDENCIES(${MODULE} mops1) + ADD_DEPENDENCIES(${MODULE} mops2) +endif (NOT MSVC) + diff --git a/importexport/bb/bb.cmake b/importexport/bb/bb.cmake new file mode 100644 index 0000000000..33fb0bd90e --- /dev/null +++ b/importexport/bb/bb.cmake @@ -0,0 +1,4 @@ + +file(GLOB BB_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* +) diff --git a/mscore/bb.cpp b/importexport/bb/bb.cpp similarity index 100% rename from mscore/bb.cpp rename to importexport/bb/bb.cpp diff --git a/mscore/bb.h b/importexport/bb/bb.h similarity index 100% rename from mscore/bb.h rename to importexport/bb/bb.h diff --git a/importexport/bww/bww.cmake b/importexport/bww/bww.cmake new file mode 100644 index 0000000000..040c403802 --- /dev/null +++ b/importexport/bww/bww.cmake @@ -0,0 +1,4 @@ + +file(GLOB BWW_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* +) diff --git a/mscore/importbww.cpp b/importexport/bww/importbww.cpp similarity index 99% rename from mscore/importbww.cpp rename to importexport/bww/importbww.cpp index 4507b670a6..2226763a52 100644 --- a/mscore/importbww.cpp +++ b/importexport/bww/importbww.cpp @@ -20,9 +20,9 @@ // TODO LVI 2011-10-30: determine how to report import errors. // Currently all output (both debug and error reports) are done using qDebug. -#include "bww2mxml/lexer.h" -#include "bww2mxml/writer.h" -#include "bww2mxml/parser.h" +#include "lexer.h" +#include "writer.h" +#include "parser.h" #include "libmscore/fraction.h" #include "libmscore/barline.h" @@ -44,8 +44,6 @@ #include "libmscore/tuplet.h" #include "libmscore/volta.h" #include "libmscore/segment.h" -#include "musescore.h" -#include "musicxml.h" //--------------------------------------------------------- // addText diff --git a/bww2mxml/lexer.cpp b/importexport/bww/lexer.cpp similarity index 100% rename from bww2mxml/lexer.cpp rename to importexport/bww/lexer.cpp diff --git a/bww2mxml/lexer.h b/importexport/bww/lexer.h similarity index 100% rename from bww2mxml/lexer.h rename to importexport/bww/lexer.h diff --git a/bww2mxml/parser.cpp b/importexport/bww/parser.cpp similarity index 100% rename from bww2mxml/parser.cpp rename to importexport/bww/parser.cpp diff --git a/bww2mxml/parser.h b/importexport/bww/parser.h similarity index 100% rename from bww2mxml/parser.h rename to importexport/bww/parser.h diff --git a/bww2mxml/symbols.cpp b/importexport/bww/symbols.cpp similarity index 100% rename from bww2mxml/symbols.cpp rename to importexport/bww/symbols.cpp diff --git a/bww2mxml/symbols.h b/importexport/bww/symbols.h similarity index 100% rename from bww2mxml/symbols.h rename to importexport/bww/symbols.h diff --git a/bww2mxml/writer.cpp b/importexport/bww/writer.cpp similarity index 100% rename from bww2mxml/writer.cpp rename to importexport/bww/writer.cpp diff --git a/bww2mxml/writer.h b/importexport/bww/writer.h similarity index 100% rename from bww2mxml/writer.h rename to importexport/bww/writer.h diff --git a/importexport/capella/capella.cmake b/importexport/capella/capella.cmake new file mode 100644 index 0000000000..34b7737c52 --- /dev/null +++ b/importexport/capella/capella.cmake @@ -0,0 +1,13 @@ + + +set (RTF2HTML_SRC + ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/fmt_opts.cpp + ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf2html.cpp + ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf_keyword.cpp + ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf_table.cpp + ) + +file(GLOB CAPELLA_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* + ${RTF2HTML_SRC} + ) diff --git a/mscore/capella.cpp b/importexport/capella/capella.cpp similarity index 100% rename from mscore/capella.cpp rename to importexport/capella/capella.cpp diff --git a/mscore/capella.h b/importexport/capella/capella.h similarity index 99% rename from mscore/capella.h rename to importexport/capella/capella.h index 3f2f8d31a7..e51c9dcd5e 100644 --- a/mscore/capella.h +++ b/importexport/capella/capella.h @@ -20,7 +20,6 @@ #ifndef __CAPELLA_H__ #define __CAPELLA_H__ -#include "globals.h" #include "libmscore/xml.h" namespace Ms { diff --git a/mscore/capxml.cpp b/importexport/capella/capxml.cpp similarity index 100% rename from mscore/capxml.cpp rename to importexport/capella/capxml.cpp diff --git a/importexport/guitarpro/guitarpro.cmake b/importexport/guitarpro/guitarpro.cmake new file mode 100644 index 0000000000..dd3ed722e1 --- /dev/null +++ b/importexport/guitarpro/guitarpro.cmake @@ -0,0 +1,4 @@ + +file(GLOB GUITARPRO_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* +) diff --git a/mscore/importgtp-gp4.cpp b/importexport/guitarpro/importgtp-gp4.cpp similarity index 99% rename from mscore/importgtp-gp4.cpp rename to importexport/guitarpro/importgtp-gp4.cpp index 23c80da238..b232e82a8b 100644 --- a/mscore/importgtp-gp4.cpp +++ b/importexport/guitarpro/importgtp-gp4.cpp @@ -11,7 +11,7 @@ //============================================================================= #include "importgtp.h" -#include "globals.h" + #include #include #include diff --git a/mscore/importgtp-gp5.cpp b/importexport/guitarpro/importgtp-gp5.cpp similarity index 99% rename from mscore/importgtp-gp5.cpp rename to importexport/guitarpro/importgtp-gp5.cpp index bb28403b7f..c847ec85ad 100644 --- a/mscore/importgtp-gp5.cpp +++ b/importexport/guitarpro/importgtp-gp5.cpp @@ -11,7 +11,7 @@ //============================================================================= #include "importgtp.h" -#include "globals.h" + #include #include #include diff --git a/mscore/importgtp-gp6.cpp b/importexport/guitarpro/importgtp-gp6.cpp similarity index 99% rename from mscore/importgtp-gp6.cpp rename to importexport/guitarpro/importgtp-gp6.cpp index ba0695a8ce..b50f8efe8e 100644 --- a/mscore/importgtp-gp6.cpp +++ b/importexport/guitarpro/importgtp-gp6.cpp @@ -12,7 +12,7 @@ //============================================================================= #include "importgtp.h" -#include "globals.h" + #include #include #include diff --git a/mscore/importgtp-gp7.cpp b/importexport/guitarpro/importgtp-gp7.cpp similarity index 100% rename from mscore/importgtp-gp7.cpp rename to importexport/guitarpro/importgtp-gp7.cpp diff --git a/mscore/importgtp.cpp b/importexport/guitarpro/importgtp.cpp similarity index 99% rename from mscore/importgtp.cpp rename to importexport/guitarpro/importgtp.cpp index 10d2440050..31bd60043e 100644 --- a/mscore/importgtp.cpp +++ b/importexport/guitarpro/importgtp.cpp @@ -11,9 +11,11 @@ //============================================================================= #include "importgtp.h" + #include "importptb.h" -#include "globals.h" -#include "preferences.h" + +#include "mscore/preferences.h" + #include #include #include diff --git a/mscore/importgtp.h b/importexport/guitarpro/importgtp.h similarity index 100% rename from mscore/importgtp.h rename to importexport/guitarpro/importgtp.h diff --git a/mscore/importptb.cpp b/importexport/guitarpro/importptb.cpp similarity index 100% rename from mscore/importptb.cpp rename to importexport/guitarpro/importptb.cpp diff --git a/mscore/importptb.h b/importexport/guitarpro/importptb.h similarity index 100% rename from mscore/importptb.h rename to importexport/guitarpro/importptb.h diff --git a/mscore/exportmidi.cpp b/importexport/midiexport/exportmidi.cpp similarity index 99% rename from mscore/exportmidi.cpp rename to importexport/midiexport/exportmidi.cpp index 5a8cd3914e..c5210af785 100644 --- a/mscore/exportmidi.cpp +++ b/importexport/midiexport/exportmidi.cpp @@ -11,19 +11,21 @@ //============================================================================= #include "exportmidi.h" -#include "midi/midifile.h" + #include "libmscore/score.h" #include "libmscore/part.h" #include "libmscore/staff.h" #include "libmscore/tempo.h" -#include "synthesizer/event.h" #include "libmscore/sig.h" #include "libmscore/key.h" #include "libmscore/text.h" #include "libmscore/measure.h" #include "libmscore/repeatlist.h" #include "libmscore/synthesizerstate.h" -#include "preferences.h" + +#include "midi/midifile.h" +#include "synthesizer/event.h" +#include "mscore/preferences.h" namespace Ms { diff --git a/mscore/exportmidi.h b/importexport/midiexport/exportmidi.h similarity index 100% rename from mscore/exportmidi.h rename to importexport/midiexport/exportmidi.h diff --git a/importexport/midiexport/midiexport.cmake b/importexport/midiexport/midiexport.cmake new file mode 100644 index 0000000000..ad667d531d --- /dev/null +++ b/importexport/midiexport/midiexport.cmake @@ -0,0 +1,5 @@ + + +file(GLOB MIDIEXPORT_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* + ) diff --git a/mscore/importmidi/importmidi.cpp b/importexport/midiimport/importmidi.cpp similarity index 100% rename from mscore/importmidi/importmidi.cpp rename to importexport/midiimport/importmidi.cpp diff --git a/mscore/importmidi/importmidi_beat.cpp b/importexport/midiimport/importmidi_beat.cpp similarity index 100% rename from mscore/importmidi/importmidi_beat.cpp rename to importexport/midiimport/importmidi_beat.cpp diff --git a/mscore/importmidi/importmidi_beat.h b/importexport/midiimport/importmidi_beat.h similarity index 100% rename from mscore/importmidi/importmidi_beat.h rename to importexport/midiimport/importmidi_beat.h diff --git a/mscore/importmidi/importmidi_chord.cpp b/importexport/midiimport/importmidi_chord.cpp similarity index 100% rename from mscore/importmidi/importmidi_chord.cpp rename to importexport/midiimport/importmidi_chord.cpp diff --git a/mscore/importmidi/importmidi_chord.h b/importexport/midiimport/importmidi_chord.h similarity index 100% rename from mscore/importmidi/importmidi_chord.h rename to importexport/midiimport/importmidi_chord.h diff --git a/mscore/importmidi/importmidi_chordname.cpp b/importexport/midiimport/importmidi_chordname.cpp similarity index 100% rename from mscore/importmidi/importmidi_chordname.cpp rename to importexport/midiimport/importmidi_chordname.cpp diff --git a/mscore/importmidi/importmidi_chordname.h b/importexport/midiimport/importmidi_chordname.h similarity index 100% rename from mscore/importmidi/importmidi_chordname.h rename to importexport/midiimport/importmidi_chordname.h diff --git a/mscore/importmidi/importmidi_clef.cpp b/importexport/midiimport/importmidi_clef.cpp similarity index 100% rename from mscore/importmidi/importmidi_clef.cpp rename to importexport/midiimport/importmidi_clef.cpp diff --git a/mscore/importmidi/importmidi_clef.h b/importexport/midiimport/importmidi_clef.h similarity index 100% rename from mscore/importmidi/importmidi_clef.h rename to importexport/midiimport/importmidi_clef.h diff --git a/mscore/importmidi/importmidi_drum.cpp b/importexport/midiimport/importmidi_drum.cpp similarity index 100% rename from mscore/importmidi/importmidi_drum.cpp rename to importexport/midiimport/importmidi_drum.cpp diff --git a/mscore/importmidi/importmidi_drum.h b/importexport/midiimport/importmidi_drum.h similarity index 100% rename from mscore/importmidi/importmidi_drum.h rename to importexport/midiimport/importmidi_drum.h diff --git a/mscore/importmidi/importmidi_fraction.cpp b/importexport/midiimport/importmidi_fraction.cpp similarity index 100% rename from mscore/importmidi/importmidi_fraction.cpp rename to importexport/midiimport/importmidi_fraction.cpp diff --git a/mscore/importmidi/importmidi_fraction.h b/importexport/midiimport/importmidi_fraction.h similarity index 100% rename from mscore/importmidi/importmidi_fraction.h rename to importexport/midiimport/importmidi_fraction.h diff --git a/mscore/importmidi/importmidi_inner.cpp b/importexport/midiimport/importmidi_inner.cpp similarity index 100% rename from mscore/importmidi/importmidi_inner.cpp rename to importexport/midiimport/importmidi_inner.cpp diff --git a/mscore/importmidi/importmidi_inner.h b/importexport/midiimport/importmidi_inner.h similarity index 100% rename from mscore/importmidi/importmidi_inner.h rename to importexport/midiimport/importmidi_inner.h diff --git a/mscore/importmidi/importmidi_instrument.cpp b/importexport/midiimport/importmidi_instrument.cpp similarity index 100% rename from mscore/importmidi/importmidi_instrument.cpp rename to importexport/midiimport/importmidi_instrument.cpp diff --git a/mscore/importmidi/importmidi_instrument.h b/importexport/midiimport/importmidi_instrument.h similarity index 100% rename from mscore/importmidi/importmidi_instrument.h rename to importexport/midiimport/importmidi_instrument.h diff --git a/mscore/importmidi/importmidi_key.cpp b/importexport/midiimport/importmidi_key.cpp similarity index 100% rename from mscore/importmidi/importmidi_key.cpp rename to importexport/midiimport/importmidi_key.cpp diff --git a/mscore/importmidi/importmidi_key.h b/importexport/midiimport/importmidi_key.h similarity index 100% rename from mscore/importmidi/importmidi_key.h rename to importexport/midiimport/importmidi_key.h diff --git a/mscore/importmidi/importmidi_lrhand.cpp b/importexport/midiimport/importmidi_lrhand.cpp similarity index 100% rename from mscore/importmidi/importmidi_lrhand.cpp rename to importexport/midiimport/importmidi_lrhand.cpp diff --git a/mscore/importmidi/importmidi_lrhand.h b/importexport/midiimport/importmidi_lrhand.h similarity index 100% rename from mscore/importmidi/importmidi_lrhand.h rename to importexport/midiimport/importmidi_lrhand.h diff --git a/mscore/importmidi/importmidi_lyrics.cpp b/importexport/midiimport/importmidi_lyrics.cpp similarity index 100% rename from mscore/importmidi/importmidi_lyrics.cpp rename to importexport/midiimport/importmidi_lyrics.cpp diff --git a/mscore/importmidi/importmidi_lyrics.h b/importexport/midiimport/importmidi_lyrics.h similarity index 100% rename from mscore/importmidi/importmidi_lyrics.h rename to importexport/midiimport/importmidi_lyrics.h diff --git a/mscore/importmidi/importmidi_meter.cpp b/importexport/midiimport/importmidi_meter.cpp similarity index 100% rename from mscore/importmidi/importmidi_meter.cpp rename to importexport/midiimport/importmidi_meter.cpp diff --git a/mscore/importmidi/importmidi_meter.h b/importexport/midiimport/importmidi_meter.h similarity index 100% rename from mscore/importmidi/importmidi_meter.h rename to importexport/midiimport/importmidi_meter.h diff --git a/mscore/importmidi/importmidi_model.cpp b/importexport/midiimport/importmidi_model.cpp similarity index 100% rename from mscore/importmidi/importmidi_model.cpp rename to importexport/midiimport/importmidi_model.cpp diff --git a/mscore/importmidi/importmidi_model.h b/importexport/midiimport/importmidi_model.h similarity index 100% rename from mscore/importmidi/importmidi_model.h rename to importexport/midiimport/importmidi_model.h diff --git a/mscore/importmidi/importmidi_operation.h b/importexport/midiimport/importmidi_operation.h similarity index 100% rename from mscore/importmidi/importmidi_operation.h rename to importexport/midiimport/importmidi_operation.h diff --git a/mscore/importmidi/importmidi_operations.cpp b/importexport/midiimport/importmidi_operations.cpp similarity index 100% rename from mscore/importmidi/importmidi_operations.cpp rename to importexport/midiimport/importmidi_operations.cpp diff --git a/mscore/importmidi/importmidi_operations.h b/importexport/midiimport/importmidi_operations.h similarity index 100% rename from mscore/importmidi/importmidi_operations.h rename to importexport/midiimport/importmidi_operations.h diff --git a/mscore/importmidi/importmidi_quant.cpp b/importexport/midiimport/importmidi_quant.cpp similarity index 100% rename from mscore/importmidi/importmidi_quant.cpp rename to importexport/midiimport/importmidi_quant.cpp diff --git a/mscore/importmidi/importmidi_quant.h b/importexport/midiimport/importmidi_quant.h similarity index 100% rename from mscore/importmidi/importmidi_quant.h rename to importexport/midiimport/importmidi_quant.h diff --git a/mscore/importmidi/importmidi_simplify.cpp b/importexport/midiimport/importmidi_simplify.cpp similarity index 100% rename from mscore/importmidi/importmidi_simplify.cpp rename to importexport/midiimport/importmidi_simplify.cpp diff --git a/mscore/importmidi/importmidi_simplify.h b/importexport/midiimport/importmidi_simplify.h similarity index 100% rename from mscore/importmidi/importmidi_simplify.h rename to importexport/midiimport/importmidi_simplify.h diff --git a/mscore/importmidi/importmidi_swing.cpp b/importexport/midiimport/importmidi_swing.cpp similarity index 100% rename from mscore/importmidi/importmidi_swing.cpp rename to importexport/midiimport/importmidi_swing.cpp diff --git a/mscore/importmidi/importmidi_swing.h b/importexport/midiimport/importmidi_swing.h similarity index 100% rename from mscore/importmidi/importmidi_swing.h rename to importexport/midiimport/importmidi_swing.h diff --git a/mscore/importmidi/importmidi_tempo.cpp b/importexport/midiimport/importmidi_tempo.cpp similarity index 100% rename from mscore/importmidi/importmidi_tempo.cpp rename to importexport/midiimport/importmidi_tempo.cpp diff --git a/mscore/importmidi/importmidi_tempo.h b/importexport/midiimport/importmidi_tempo.h similarity index 100% rename from mscore/importmidi/importmidi_tempo.h rename to importexport/midiimport/importmidi_tempo.h diff --git a/mscore/importmidi/importmidi_tie.cpp b/importexport/midiimport/importmidi_tie.cpp similarity index 100% rename from mscore/importmidi/importmidi_tie.cpp rename to importexport/midiimport/importmidi_tie.cpp diff --git a/mscore/importmidi/importmidi_tie.h b/importexport/midiimport/importmidi_tie.h similarity index 100% rename from mscore/importmidi/importmidi_tie.h rename to importexport/midiimport/importmidi_tie.h diff --git a/mscore/importmidi/importmidi_tuplet.cpp b/importexport/midiimport/importmidi_tuplet.cpp similarity index 100% rename from mscore/importmidi/importmidi_tuplet.cpp rename to importexport/midiimport/importmidi_tuplet.cpp diff --git a/mscore/importmidi/importmidi_tuplet.h b/importexport/midiimport/importmidi_tuplet.h similarity index 100% rename from mscore/importmidi/importmidi_tuplet.h rename to importexport/midiimport/importmidi_tuplet.h diff --git a/mscore/importmidi/importmidi_tuplet_detect.cpp b/importexport/midiimport/importmidi_tuplet_detect.cpp similarity index 100% rename from mscore/importmidi/importmidi_tuplet_detect.cpp rename to importexport/midiimport/importmidi_tuplet_detect.cpp diff --git a/mscore/importmidi/importmidi_tuplet_detect.h b/importexport/midiimport/importmidi_tuplet_detect.h similarity index 100% rename from mscore/importmidi/importmidi_tuplet_detect.h rename to importexport/midiimport/importmidi_tuplet_detect.h diff --git a/mscore/importmidi/importmidi_tuplet_filter.cpp b/importexport/midiimport/importmidi_tuplet_filter.cpp similarity index 100% rename from mscore/importmidi/importmidi_tuplet_filter.cpp rename to importexport/midiimport/importmidi_tuplet_filter.cpp diff --git a/mscore/importmidi/importmidi_tuplet_filter.h b/importexport/midiimport/importmidi_tuplet_filter.h similarity index 100% rename from mscore/importmidi/importmidi_tuplet_filter.h rename to importexport/midiimport/importmidi_tuplet_filter.h diff --git a/mscore/importmidi/importmidi_tuplet_tonotes.cpp b/importexport/midiimport/importmidi_tuplet_tonotes.cpp similarity index 100% rename from mscore/importmidi/importmidi_tuplet_tonotes.cpp rename to importexport/midiimport/importmidi_tuplet_tonotes.cpp diff --git a/mscore/importmidi/importmidi_tuplet_tonotes.h b/importexport/midiimport/importmidi_tuplet_tonotes.h similarity index 100% rename from mscore/importmidi/importmidi_tuplet_tonotes.h rename to importexport/midiimport/importmidi_tuplet_tonotes.h diff --git a/mscore/importmidi/importmidi_tuplet_voice.cpp b/importexport/midiimport/importmidi_tuplet_voice.cpp similarity index 100% rename from mscore/importmidi/importmidi_tuplet_voice.cpp rename to importexport/midiimport/importmidi_tuplet_voice.cpp diff --git a/mscore/importmidi/importmidi_tuplet_voice.h b/importexport/midiimport/importmidi_tuplet_voice.h similarity index 100% rename from mscore/importmidi/importmidi_tuplet_voice.h rename to importexport/midiimport/importmidi_tuplet_voice.h diff --git a/mscore/importmidi/importmidi_voice.cpp b/importexport/midiimport/importmidi_voice.cpp similarity index 100% rename from mscore/importmidi/importmidi_voice.cpp rename to importexport/midiimport/importmidi_voice.cpp diff --git a/mscore/importmidi/importmidi_voice.h b/importexport/midiimport/importmidi_voice.h similarity index 100% rename from mscore/importmidi/importmidi_voice.h rename to importexport/midiimport/importmidi_voice.h diff --git a/importexport/midiimport/midiimport.cmake b/importexport/midiimport/midiimport.cmake new file mode 100644 index 0000000000..78971851ad --- /dev/null +++ b/importexport/midiimport/midiimport.cmake @@ -0,0 +1,14 @@ + + +set (BEATROOT_SRC + ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/Agent.cpp + ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/AgentList.cpp + ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/BeatTracker.cpp + ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/Induction.cpp + ) + + +file(GLOB MIDIIMPORT_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* + ${BEATROOT_SRC} + ) diff --git a/importexport/musedata/musedata.cmake b/importexport/musedata/musedata.cmake new file mode 100644 index 0000000000..7468de202b --- /dev/null +++ b/importexport/musedata/musedata.cmake @@ -0,0 +1,4 @@ + +file(GLOB MUSEDATA_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* +) diff --git a/mscore/musedata.cpp b/importexport/musedata/musedata.cpp similarity index 100% rename from mscore/musedata.cpp rename to importexport/musedata/musedata.cpp diff --git a/mscore/musedata.h b/importexport/musedata/musedata.h similarity index 100% rename from mscore/musedata.h rename to importexport/musedata/musedata.h diff --git a/mscore/exportxml.cpp b/importexport/musicxml/exportxml.cpp similarity index 99% rename from mscore/exportxml.cpp rename to importexport/musicxml/exportxml.cpp index 5a4ae2363e..a4bcf92eb7 100644 --- a/mscore/exportxml.cpp +++ b/importexport/musicxml/exportxml.cpp @@ -36,8 +36,14 @@ #include #include "config.h" -//#include "musescore.h" -#include "file.h" + +#include "musicxml.h" +#include "musicxmlfonthandler.h" + +#include "thirdparty/qzip/qzipwriter_p.h" + +#include "mscore/preferences.h" + #include "libmscore/score.h" #include "libmscore/rest.h" #include "libmscore/chord.h" @@ -52,7 +58,6 @@ #include "libmscore/part.h" #include "libmscore/measure.h" #include "libmscore/style.h" -#include "musicxml.h" #include "libmscore/slur.h" #include "libmscore/hairpin.h" #include "libmscore/dynamic.h" @@ -84,7 +89,6 @@ #include "libmscore/navigate.h" #include "libmscore/spanner.h" #include "libmscore/drumset.h" -#include "preferences.h" #include "libmscore/mscore.h" #include "libmscore/accidental.h" #include "libmscore/breath.h" @@ -92,13 +96,11 @@ #include "libmscore/figuredbass.h" #include "libmscore/stringdata.h" #include "libmscore/rehearsalmark.h" -#include "thirdparty/qzip/qzipwriter_p.h" #include "libmscore/fret.h" #include "libmscore/tie.h" #include "libmscore/undo.h" #include "libmscore/textline.h" #include "libmscore/fermata.h" -#include "musicxmlfonthandler.h" #include "libmscore/textframe.h" #include "libmscore/instrchange.h" diff --git a/mscore/importmxml.cpp b/importexport/musicxml/importmxml.cpp similarity index 98% rename from mscore/importmxml.cpp rename to importexport/musicxml/importmxml.cpp index 9ba94732fa..841bf05cf2 100644 --- a/mscore/importmxml.cpp +++ b/importexport/musicxml/importmxml.cpp @@ -29,7 +29,8 @@ #include "importmxmllogger.h" #include "importmxmlpass1.h" #include "importmxmlpass2.h" -#include "preferences.h" + +#include "mscore/preferences.h" namespace Ms { diff --git a/mscore/importmxml.h b/importexport/musicxml/importmxml.h similarity index 100% rename from mscore/importmxml.h rename to importexport/musicxml/importmxml.h diff --git a/mscore/importmxmllogger.cpp b/importexport/musicxml/importmxmllogger.cpp similarity index 100% rename from mscore/importmxmllogger.cpp rename to importexport/musicxml/importmxmllogger.cpp diff --git a/mscore/importmxmllogger.h b/importexport/musicxml/importmxmllogger.h similarity index 100% rename from mscore/importmxmllogger.h rename to importexport/musicxml/importmxmllogger.h diff --git a/mscore/importmxmlnoteduration.cpp b/importexport/musicxml/importmxmlnoteduration.cpp similarity index 100% rename from mscore/importmxmlnoteduration.cpp rename to importexport/musicxml/importmxmlnoteduration.cpp diff --git a/mscore/importmxmlnoteduration.h b/importexport/musicxml/importmxmlnoteduration.h similarity index 100% rename from mscore/importmxmlnoteduration.h rename to importexport/musicxml/importmxmlnoteduration.h diff --git a/mscore/importmxmlnotepitch.cpp b/importexport/musicxml/importmxmlnotepitch.cpp similarity index 100% rename from mscore/importmxmlnotepitch.cpp rename to importexport/musicxml/importmxmlnotepitch.cpp diff --git a/mscore/importmxmlnotepitch.h b/importexport/musicxml/importmxmlnotepitch.h similarity index 100% rename from mscore/importmxmlnotepitch.h rename to importexport/musicxml/importmxmlnotepitch.h diff --git a/mscore/importmxmlpass1.cpp b/importexport/musicxml/importmxmlpass1.cpp similarity index 99% rename from mscore/importmxmlpass1.cpp rename to importexport/musicxml/importmxmlpass1.cpp index 580c93d9bf..9aab0322f2 100644 --- a/mscore/importmxmlpass1.cpp +++ b/importexport/musicxml/importmxmlpass1.cpp @@ -36,7 +36,8 @@ #include "importmxmlnoteduration.h" #include "importmxmlpass1.h" #include "importmxmlpass2.h" -#include "preferences.h" + +#include "mscore/preferences.h" namespace Ms { diff --git a/mscore/importmxmlpass1.h b/importexport/musicxml/importmxmlpass1.h similarity index 100% rename from mscore/importmxmlpass1.h rename to importexport/musicxml/importmxmlpass1.h diff --git a/mscore/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp similarity index 99% rename from mscore/importmxmlpass2.cpp rename to importexport/musicxml/importmxmlpass2.cpp index eadb1d38e8..b7b47de9f9 100644 --- a/mscore/importmxmlpass2.cpp +++ b/importexport/musicxml/importmxmlpass2.cpp @@ -72,7 +72,8 @@ #include "importmxmlpass2.h" #include "musicxmlfonthandler.h" #include "musicxmlsupport.h" -#include "preferences.h" + +#include "mscore/preferences.h" namespace Ms { diff --git a/mscore/importmxmlpass2.h b/importexport/musicxml/importmxmlpass2.h similarity index 100% rename from mscore/importmxmlpass2.h rename to importexport/musicxml/importmxmlpass2.h diff --git a/mscore/importxml.cpp b/importexport/musicxml/importxml.cpp similarity index 100% rename from mscore/importxml.cpp rename to importexport/musicxml/importxml.cpp diff --git a/mscore/importxmlfirstpass.cpp b/importexport/musicxml/importxmlfirstpass.cpp similarity index 100% rename from mscore/importxmlfirstpass.cpp rename to importexport/musicxml/importxmlfirstpass.cpp diff --git a/mscore/importxmlfirstpass.h b/importexport/musicxml/importxmlfirstpass.h similarity index 100% rename from mscore/importxmlfirstpass.h rename to importexport/musicxml/importxmlfirstpass.h diff --git a/importexport/musicxml/musicxml.cmake b/importexport/musicxml/musicxml.cmake new file mode 100644 index 0000000000..d3ec6a2dbe --- /dev/null +++ b/importexport/musicxml/musicxml.cmake @@ -0,0 +1,4 @@ + +file(GLOB MUSICXML_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* +) diff --git a/mscore/musicxml.h b/importexport/musicxml/musicxml.h similarity index 100% rename from mscore/musicxml.h rename to importexport/musicxml/musicxml.h diff --git a/mscore/musicxmlfonthandler.cpp b/importexport/musicxml/musicxmlfonthandler.cpp similarity index 100% rename from mscore/musicxmlfonthandler.cpp rename to importexport/musicxml/musicxmlfonthandler.cpp diff --git a/mscore/musicxmlfonthandler.h b/importexport/musicxml/musicxmlfonthandler.h similarity index 100% rename from mscore/musicxmlfonthandler.h rename to importexport/musicxml/musicxmlfonthandler.h diff --git a/mscore/musicxmlsupport.cpp b/importexport/musicxml/musicxmlsupport.cpp similarity index 99% rename from mscore/musicxmlsupport.cpp rename to importexport/musicxml/musicxmlsupport.cpp index b32d141b09..0842ad016e 100644 --- a/mscore/musicxmlsupport.cpp +++ b/importexport/musicxml/musicxmlsupport.cpp @@ -21,8 +21,8 @@ MusicXML support. */ -#include "globals.h" #include "musicxmlsupport.h" + #include "libmscore/sym.h" #include "libmscore/accidental.h" diff --git a/mscore/musicxmlsupport.h b/importexport/musicxml/musicxmlsupport.h similarity index 100% rename from mscore/musicxmlsupport.h rename to importexport/musicxml/musicxmlsupport.h diff --git a/mscore/importove.cpp b/importexport/ove/importove.cpp similarity index 99% rename from mscore/importove.cpp rename to importexport/ove/importove.cpp index 8aa6f5a3d9..646fa18f05 100644 --- a/mscore/importove.cpp +++ b/importexport/ove/importove.cpp @@ -19,8 +19,8 @@ #include "ove.h" -#include "globals.h" -//#include "musescore.h" +#include "mscore/preferences.h" + #include "libmscore/sig.h" #include "libmscore/tempo.h" #include "libmscore/arpeggio.h" @@ -46,7 +46,6 @@ #include "libmscore/part.h" #include "libmscore/pedal.h" #include "libmscore/pitchspelling.h" -#include "preferences.h" #include "libmscore/repeat.h" #include "libmscore/rest.h" #include "libmscore/score.h" diff --git a/importexport/ove/ove.cmake b/importexport/ove/ove.cmake new file mode 100644 index 0000000000..7b83bb8709 --- /dev/null +++ b/importexport/ove/ove.cmake @@ -0,0 +1,4 @@ + +file(GLOB OVE_SRC + ${CMAKE_CURRENT_LIST_DIR}/*.* +) diff --git a/mscore/ove.cpp b/importexport/ove/ove.cpp similarity index 100% rename from mscore/ove.cpp rename to importexport/ove/ove.cpp diff --git a/mscore/ove.h b/importexport/ove/ove.h similarity index 100% rename from mscore/ove.h rename to importexport/ove/ove.h diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt index c56fc5d2ed..0bb7a2b5f4 100644 --- a/mscore/CMakeLists.txt +++ b/mscore/CMakeLists.txt @@ -46,6 +46,7 @@ include_directories( ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/thirdparty ${PROJECT_SOURCE_DIR}/global + ${PROJECT_SOURCE_DIR}/importexport ${QTSINGLEAPPLICATION_INCLUDE_DIRS} ) @@ -104,7 +105,7 @@ QT5_WRAP_UI (ui_headers logindialog.ui uploadscoredialog.ui breaksdialog.ui toolbarEditor.ui workspacedialog.ui - importmidi/importmidi_panel.ui + importmidi_ui/importmidi_panel.ui palette/createPalette.ui scorecmp/scorecmp_tool.ui @@ -309,24 +310,23 @@ add_library(mscoreapp STATIC ${INCS} abstractdialog.h accessibletoolbutton.h albummanager.h - alsa.h alsamidi.h analyse.h articulationprop.h bb.h - bendcanvas.h breaksdialog.h capella.h + alsa.h alsamidi.h analyse.h articulationprop.h + bendcanvas.h breaksdialog.h chordview.h click.h continuouspanel.h downloadUtils.h driver.h drumroll.h drumtools.h drumview.h editdrumset.h editinstrument.h editpitch.h editraster.h editstaff.h editstafftype.h editstringdata.h editstyle.h enableplayforwidget.h - exampleview.h excerptsdialog.h exportmidi.h exportmp3.h extension.h + exampleview.h excerptsdialog.h exportmp3.h extension.h file.h fotomode.h fretcanvas.h globals.h greendotbutton.h - harmonycanvas.h harmonyedit.h help.h helpBrowser.h icons.h importgtp.h importmxml.h - importmxmllogger.h importmxmlnoteduration.h importmxmlnotepitch.h importmxmlpass1.h - importmxmlpass2.h importptb.h importxmlfirstpass.h instrdialog.h instrwidget.h jackaudio.h + harmonycanvas.h harmonyedit.h help.h helpBrowser.h icons.h + instrdialog.h instrwidget.h jackaudio.h keycanvas.h keyedit.h layer.h licence.h logindialog.h network/loginmanager.h network/loginmanager_p.h magbox.h masterpalette.h measureproperties.h mediadialog.h metaedit.h miconengine.h mididriver.h - mixer.h mixertrack.h mixertrackchannel.h mixertrackgroup.h mixertrackitem.h mixertrackpart.h mixerdetails.h musedata.h - musescore.h musicxml.h musicxmlfonthandler.h musicxmlsupport.h navigator.h newwizard.h noteGroups.h - omrpanel.h ove.h pa.h pagesettings.h palette.h partedit.h parteditbase.h + mixer.h mixertrack.h mixertrackchannel.h mixertrackgroup.h mixertrackitem.h mixertrackpart.h mixerdetails.h + musescore.h navigator.h newwizard.h noteGroups.h + omrpanel.h pa.h pagesettings.h palette.h partedit.h parteditbase.h pathlistdialog.h piano.h pianolevels.h pianolevelschooser.h pianolevelsfilter.h pianokeyboard.h pianoroll.h pianoruler.h pianotools.h pianoview.h playpanel.h pm.h preferences.h preferenceslistwidget.h prefsdialog.h @@ -343,9 +343,7 @@ add_library(mscoreapp STATIC stringutils.h stringutils.cpp scoreview.cpp editharmony.cpp editfiguredbass.cpp events.cpp editinstrument.cpp editstyle.cpp - icons.cpp importbww.cpp - importmxmllogger.cpp importmxmlnoteduration.cpp importmxmlnotepitch.cpp - importmxml.cpp importmxmlpass1.cpp importmxmlpass2.cpp + icons.cpp instrdialog.cpp instrwidget.cpp debugger/debugger.cpp menus.cpp musescore.cpp musescoredialogs.cpp navigator.cpp pagesettings.cpp palette.cpp @@ -356,20 +354,16 @@ add_library(mscoreapp STATIC preferences.cpp measureproperties.cpp seq.cpp textpalette.cpp timedialog.cpp symboldialog.cpp shortcutcapturedialog.cpp - simplebutton.cpp musedata.cpp + simplebutton.cpp editdrumset.cpp editstaff.cpp timesigproperties.cpp newwizard.cpp transposedialog.cpp excerptsdialog.cpp metaedit.cpp magbox.cpp realizeharmonydialog.cpp - capella.cpp capxml.cpp exportaudio.cpp + exportaudio.cpp synthcontrol.cpp drumroll.cpp pianoroll.cpp piano.cpp pianokeyboard.cpp pianolevels.cpp pianolevelschooser.cpp pianolevelsfilter.cpp pianoruler.cpp pianoview.cpp drumview.cpp scoretab.cpp keyedit.cpp harmonyedit.cpp updatechecker.cpp - importove.cpp - ove.cpp ruler.cpp - importgtp.cpp importgtp-gp4.cpp importgtp-gp5.cpp importgtp-gp6.cpp importgtp-gp7.cpp - importptb.cpp fotomode.cpp drumtools.cpp selinstrument.cpp editstafftype.cpp texttools.cpp editpitch.cpp editstringdata.cpp editraster.cpp pianotools.cpp mediadialog.cpp @@ -381,7 +375,7 @@ add_library(mscoreapp STATIC articulationprop.cpp bendcanvas.cpp fretcanvas.cpp tremolobarcanvas.cpp file.cpp keyb.cpp osc.cpp - layer.cpp selectdialog.cpp selectnotedialog.cpp propertymenu.cpp shortcut.cpp bb.cpp + layer.cpp selectdialog.cpp selectnotedialog.cpp propertymenu.cpp shortcut.cpp dragelement.cpp startupWizard.cpp svggenerator.cpp masterpalette.cpp @@ -432,33 +426,20 @@ add_library(mscoreapp STATIC enableplayforwidget.cpp editelement.cpp editlyrics.cpp - musicxmlfonthandler.cpp - musicxmlsupport.cpp - exportxml.cpp - importxml.cpp - importxmlfirstpass.cpp savePositions.cpp driver.cpp - exportmidi.cpp noteGroups.cpp pathlistdialog.cpp exampleview.cpp miconengine.cpp - importmidi/importmidi.cpp - importmidi/importmidi_panel.cpp importmidi/importmidi_operations.cpp - importmidi/importmidi_model.cpp importmidi/importmidi_delegate.cpp - importmidi/importmidi_meter.cpp importmidi/importmidi_quant.cpp - importmidi/importmidi_tuplet.cpp importmidi/importmidi_chord.cpp - importmidi/importmidi_swing.cpp importmidi/importmidi_fraction.cpp - importmidi/importmidi_drum.cpp importmidi/importmidi_clef.cpp - importmidi/importmidi_lrhand.cpp importmidi/importmidi_lyrics.cpp - importmidi/importmidi_inner.cpp importmidi/importmidi_tie.cpp - importmidi/importmidi_tuplet_voice.cpp importmidi/importmidi_beat.cpp - importmidi/importmidi_tuplet_detect.cpp importmidi/importmidi_tuplet_filter.cpp - importmidi/importmidi_tuplet_tonotes.cpp importmidi/importmidi_simplify.cpp - importmidi/importmidi_voice.cpp importmidi/importmidi_view.cpp importmidi/importmidi_key.cpp - importmidi/importmidi_tempo.cpp importmidi/importmidi_instrument.cpp - importmidi/importmidi_chordname.cpp + + importmidi_ui/importmidi_panel.cpp + importmidi_ui/importmidi_panel.h + importmidi_ui/importmidi_delegate.cpp + importmidi_ui/importmidi_delegate.h + importmidi_ui/importmidi_view.cpp + importmidi_ui/importmidi_view.h + palette/createpalettedialog.cpp palette/palettedialog.cpp palette/palettecelldialog.cpp palette/palettemodel.cpp palette/palettetree.cpp palette/paletteworkspace.cpp palette/palettewidget.cpp @@ -502,16 +483,13 @@ endif (MSVC OR MINGW) target_link_libraries(mscoreapp awl - bww - rtf2html ${QTSINGLEAPPLICATION_LIBRARIES} synthesizer - midi fluid effects libmscore qzip - beatroot + importexport ) if (BUILD_CRASH_REPORTER) diff --git a/mscore/file.cpp b/mscore/file.cpp index 16afa9ba10..af5df00689 100644 --- a/mscore/file.cpp +++ b/mscore/file.cpp @@ -20,7 +20,9 @@ #include "globals.h" #include "musescore.h" #include "scoreview.h" -#include "exportmidi.h" + +#include "importexport/midiexport/exportmidi.h" + #include "libmscore/xml.h" #include "libmscore/element.h" #include "libmscore/note.h" diff --git a/mscore/importmidi/importmidi_delegate.cpp b/mscore/importmidi_ui/importmidi_delegate.cpp similarity index 100% rename from mscore/importmidi/importmidi_delegate.cpp rename to mscore/importmidi_ui/importmidi_delegate.cpp diff --git a/mscore/importmidi/importmidi_delegate.h b/mscore/importmidi_ui/importmidi_delegate.h similarity index 100% rename from mscore/importmidi/importmidi_delegate.h rename to mscore/importmidi_ui/importmidi_delegate.h diff --git a/mscore/importmidi/importmidi_panel.cpp b/mscore/importmidi_ui/importmidi_panel.cpp similarity index 97% rename from mscore/importmidi/importmidi_panel.cpp rename to mscore/importmidi_ui/importmidi_panel.cpp index bb226067eb..a0b0893e9f 100644 --- a/mscore/importmidi/importmidi_panel.cpp +++ b/mscore/importmidi_ui/importmidi_panel.cpp @@ -1,14 +1,18 @@ #include "importmidi_panel.h" + #include "ui_importmidi_panel.h" -#include "importmidi_model.h" -#include "importmidi_lyrics.h" -#include "importmidi_operations.h" #include "importmidi_delegate.h" -#include "importmidi_inner.h" -#include "mscore/preferences.h" -#include "musescore.h" + +#include "importexport/midiimport/importmidi_model.h" +#include "importexport/midiimport/importmidi_lyrics.h" +#include "importexport/midiimport/importmidi_operations.h" +#include "importexport/midiimport/importmidi_inner.h" + #include "libmscore/score.h" -#include "icons.h" + +#include "mscore/preferences.h" +#include "mscore/musescore.h" +#include "mscore/icons.h" namespace Ms { diff --git a/mscore/importmidi/importmidi_panel.h b/mscore/importmidi_ui/importmidi_panel.h similarity index 100% rename from mscore/importmidi/importmidi_panel.h rename to mscore/importmidi_ui/importmidi_panel.h diff --git a/mscore/importmidi/importmidi_panel.ui b/mscore/importmidi_ui/importmidi_panel.ui similarity index 99% rename from mscore/importmidi/importmidi_panel.ui rename to mscore/importmidi_ui/importmidi_panel.ui index 975e768491..e670131f16 100644 --- a/mscore/importmidi/importmidi_panel.ui +++ b/mscore/importmidi_ui/importmidi_panel.ui @@ -321,7 +321,7 @@ TracksView QTableView -
mscore/importmidi/importmidi_view.h
+
mscore/importmidi_ui/importmidi_view.h
 diff --git a/mscore/importmidi/importmidi_view.cpp b/mscore/importmidi_ui/importmidi_view.cpp similarity index 100% rename from mscore/importmidi/importmidi_view.cpp rename to mscore/importmidi_ui/importmidi_view.cpp diff --git a/mscore/importmidi/importmidi_view.h b/mscore/importmidi_ui/importmidi_view.h similarity index 100% rename from mscore/importmidi/importmidi_view.h rename to mscore/importmidi_ui/importmidi_view.h diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index 06cbcb9837..b3dbb4c650 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -60,9 +60,11 @@ #include "navigator.h" #include "newwizard.h" #include "timeline.h" -#include "importmidi/importmidi_panel.h" -#include "importmidi/importmidi_instrument.h" -#include "importmidi/importmidi_operations.h" + +#include "importmidi_ui/importmidi_panel.h" +#include "importexport/midiimport/importmidi_instrument.h" +#include "importexport/midiimport/importmidi_operations.h" + #include "scorecmp/scorecmp.h" #include "script/recorderwidget.h" #include "libmscore/scorediff.h" diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt index cfd3172a1a..ad75c58be3 100644 --- a/mtest/CMakeLists.txt +++ b/mtest/CMakeLists.txt @@ -46,69 +46,31 @@ add_library (testResources STATIC ${qrc_files} ) +set (IMPORTEXPORT_DIR ${PROJECT_SOURCE_DIR}/importexport) +include(${IMPORTEXPORT_DIR}/bb/bb.cmake) +include(${IMPORTEXPORT_DIR}/capella/capella.cmake) +include(${IMPORTEXPORT_DIR}/musicxml/musicxml.cmake) +include(${IMPORTEXPORT_DIR}/guitarpro/guitarpro.cmake) +include(${IMPORTEXPORT_DIR}/ove/ove.cmake) +include(${IMPORTEXPORT_DIR}/midiimport/midiimport.cmake) +include(${IMPORTEXPORT_DIR}/midiexport/midiexport.cmake) + set (SOURCE_LIB testutils.cpp mtestglobals.cpp - ${PROJECT_SOURCE_DIR}/mscore/bb.cpp - ${PROJECT_SOURCE_DIR}/mscore/capella.cpp - ${PROJECT_SOURCE_DIR}/mscore/capxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/exportxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importgtp.cpp - ${PROJECT_SOURCE_DIR}/mscore/importgtp-gp4.cpp - ${PROJECT_SOURCE_DIR}/mscore/importgtp-gp5.cpp - ${PROJECT_SOURCE_DIR}/mscore/importgtp-gp6.cpp - ${PROJECT_SOURCE_DIR}/mscore/importgtp-gp7.cpp - ${PROJECT_SOURCE_DIR}/mscore/importptb.cpp - ${PROJECT_SOURCE_DIR}/mscore/importove.cpp - ${PROJECT_SOURCE_DIR}/mscore/ove.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_operations.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_meter.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_quant.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tuplet.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tuplet_detect.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tuplet_filter.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tuplet_voice.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tuplet_tonotes.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_chord.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_fraction.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_swing.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_drum.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_clef.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_lrhand.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_lyrics.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tie.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_inner.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_beat.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_simplify.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_voice.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_key.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_tempo.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_model.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_instrument.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmidi/importmidi_chordname.cpp - ${PROJECT_SOURCE_DIR}/mscore/exportmidi.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmxml.cpp # Required by importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmxmllogger.cpp # Required by importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmxmlnoteduration.cpp # Required by importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmxmlnotepitch.cpp # Required by importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmxmlpass1.cpp # Required by importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importmxmlpass2.cpp # Required by importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importxml.cpp - ${PROJECT_SOURCE_DIR}/mscore/importxmlfirstpass.cpp - ${PROJECT_SOURCE_DIR}/mscore/musicxmlfonthandler.cpp - ${PROJECT_SOURCE_DIR}/mscore/musicxmlsupport.cpp + + ${BB_SRC} + ${CAPELLA_SRC} + ${MUSICXML_SRC} + ${MUSICXML_SRC} + ${GUITARPRO_SRC} + ${OVE_SRC} + ${MIDIIMPORT_SRC} + ${MIDIEXPORT_SRC} + ${PROJECT_SOURCE_DIR}/mscore/preferences.cpp ${PROJECT_SOURCE_DIR}/mscore/shortcut.cpp ${PROJECT_SOURCE_DIR}/mscore/stringutils.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/fmt_opts.cpp # Required by capella.cpp and capxml.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf2html.cpp # Required by capella.cpp and capxml.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf_keyword.cpp # Required by capella.cpp and capxml.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf_table.cpp # Required by capella.cpp and capxml.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/Agent.cpp # Required by importmidi.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/AgentList.cpp # Required by importmidi.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/BeatTracker.cpp # Required by importmidi.cpp - ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/Induction.cpp # Required by importmidi.cpp ${PROJECT_SOURCE_DIR}/mscore/extension.cpp # required by zerberus tests ${OMR_SRC} omr @@ -236,7 +198,6 @@ subdirs ( # libmscore/text work in progress... libmscore/utils mscore/workspaces - importmidi capella biab musicxml diff --git a/mtest/libmscore/midi/tst_midi.cpp b/mtest/libmscore/midi/tst_midi.cpp index cbca50800a..721222559a 100644 --- a/mtest/libmscore/midi/tst_midi.cpp +++ b/mtest/libmscore/midi/tst_midi.cpp @@ -23,7 +23,7 @@ #include "libmscore/chord.h" #include "libmscore/note.h" #include "libmscore/keysig.h" -#include "mscore/exportmidi.h" +#include "importexport/midiexport/exportmidi.h" #include #include "libmscore/mcursor.h"