diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-07-31 18:02:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 18:02:14 +0300 |
| commit | 1e1300a6ff99a7e559b39bf1c67bb8497a169242 (patch) | |
| tree | 1e9af4861455f24075d0879af8bfabe821c6466e /src/adlmidi_midiplay.cpp | |
| parent | e76c56784fb072b9866aee816ad240127909da16 (diff) | |
| parent | 4802570b77fde4aefa5a99c33cc012a2591e8361 (diff) | |
| download | libADLMIDI-1e1300a6ff99a7e559b39bf1c67bb8497a169242.tar.gz libADLMIDI-1e1300a6ff99a7e559b39bf1c67bb8497a169242.tar.bz2 libADLMIDI-1e1300a6ff99a7e559b39bf1c67bb8497a169242.zip | |
Merge pull request #149 from jpcima/fix-warnings
fix the gcc warning "class-memaccess"
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index a4019b2..f1adddd 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -1877,7 +1877,7 @@ ADLMIDI_EXPORT void AdlInstrumentTester::DoNote(int note) OPL3 *opl = P->opl; if(P->adl_ins_list.empty()) FindAdlList(); const unsigned meta = P->adl_ins_list[P->ins_idx]; - const adlinsdata2 ains(adlins[meta]); + const adlinsdata2 ains = adlinsdata2::from_adldata(::adlins[meta]); int tone = (P->cur_gm & 128) ? (P->cur_gm & 127) : (note + 50); if(ains.tone) @@ -1959,7 +1959,7 @@ ADLMIDI_EXPORT void AdlInstrumentTester::NextAdl(int offset) for(size_t a = 0, n = P->adl_ins_list.size(); a < n; ++a) { const unsigned i = P->adl_ins_list[a]; - const adlinsdata2 ains(adlins[i]); + const adlinsdata2 ains = adlinsdata2::from_adldata(::adlins[i]); char ToneIndication[8] = " "; if(ains.tone) |