Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP MIDIplay v2 #222

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP MIDIplay v2 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ set(libADLMIDI_SOURCES
${libADLMIDI_SOURCE_DIR}/src/adlmidi_midiplay.cpp
${libADLMIDI_SOURCE_DIR}/src/adlmidi_opl3.cpp
${libADLMIDI_SOURCE_DIR}/src/adlmidi_private.cpp
${libADLMIDI_SOURCE_DIR}/src/midiplay/chip_voice.cpp
${libADLMIDI_SOURCE_DIR}/src/midiplay/cpp_extras.cpp
${libADLMIDI_SOURCE_DIR}/src/wopl/wopl_file.c
)

Expand All @@ -225,6 +227,7 @@ if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN)
add_library(ADLMIDI_static STATIC ${libADLMIDI_SOURCES})
set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI)
target_include_directories(ADLMIDI_static PUBLIC ${libADLMIDI_SOURCE_DIR}/include)
target_include_directories(ADLMIDI_static PRIVATE ${libADLMIDI_SOURCE_DIR}/src)
set_legacy_standard(ADLMIDI_static)
set_visibility_hidden(ADLMIDI_static)
handle_options(ADLMIDI_static)
Expand All @@ -238,6 +241,7 @@ if(libADLMIDI_SHARED)
add_library(ADLMIDI_shared SHARED ${libADLMIDI_SOURCES})
set_target_properties(ADLMIDI_shared PROPERTIES OUTPUT_NAME ADLMIDI)
target_include_directories(ADLMIDI_shared PUBLIC ${libADLMIDI_SOURCE_DIR}/include)
target_include_directories(ADLMIDI_shared PRIVATE ${libADLMIDI_SOURCE_DIR}/src)
set_legacy_standard(ADLMIDI_shared)
set_visibility_hidden(ADLMIDI_shared)
handle_options(ADLMIDI_shared)
Expand Down
4 changes: 2 additions & 2 deletions src/adlmidi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ ADLMIDI_EXPORT int adl_playFormat(ADL_MIDIPlayer *device, int sampleCount,

MidiPlayer *player = GET_MIDI_PLAYER(device);
assert(player);
MidiPlayer::Setup &setup = player->m_setup;
MIDIsetup &setup = player->m_setup;

ssize_t gotten_len = 0;
ssize_t n_periodCountStereo = 512;
Expand Down Expand Up @@ -1362,7 +1362,7 @@ ADLMIDI_EXPORT int adl_generateFormat(struct ADL_MIDIPlayer *device, int sampleC

MidiPlayer *player = GET_MIDI_PLAYER(device);
assert(player);
MidiPlayer::Setup &setup = player->m_setup;
MIDIsetup &setup = player->m_setup;

ssize_t gotten_len = 0;
ssize_t n_periodCountStereo = 512;
Expand Down
352 changes: 50 additions & 302 deletions src/adlmidi_midiplay.cpp
View file
Open in desktop

Large diffs are not rendered by default.

Loading