@@ -281,6 +281,7 @@ static int cmsg(int type, int verbosity_level, char *fmt, ...);
281281static void ctl_event (CtlEvent *e);
282282std::mutex event_mutex;
283283std::mutex data_mutex;
284+ static bool m_loading = false ;
284285static bool m_running = false ;
285286static bool m_converting = false ;
286287static bool m_paused = false ;
@@ -616,9 +617,24 @@ static void reset_channels()
616617 for (int i = 0 ; i < MAX_CHANNELS; i++)
617618 {
618619 midi_channels[i].events .clear ();
619- memset (&midi_channels[i], 0 , sizeof (MIDIChannel));
620+ midi_channels[i].key_board .reset ();
621+ memset (midi_channels[i].instrum_name , 0 , 128 );
622+ midi_channels[i].velocity = 0 ;
623+ midi_channels[i].volume = 0 ;
624+ midi_channels[i].expression = 0 ;
625+ midi_channels[i].program = 0 ;
620626 midi_channels[i].panning = 64 ;
621627 midi_channels[i].pitchbend = 0x2000 ;
628+ midi_channels[i].sustain = 0 ;
629+ midi_channels[i].wheel = 0 ;
630+ midi_channels[i].mute = 0 ;
631+ midi_channels[i].bank = 0 ;
632+ midi_channels[i].bank_lsb = 0 ;
633+ midi_channels[i].bank_msb = 0 ;
634+ midi_channels[i].is_drum = 0 ;
635+ midi_channels[i].bend_mark = 0 ;
636+ midi_channels[i].check_mute = false ;
637+ midi_channels[i].check_solo = false ;
622638 }
623639}
624640
@@ -629,21 +645,6 @@ static void reset_events()
629645 cuepoint_pending = 0 ;
630646}
631647
632- static std::vector<MIDI_Event>::iterator find_last (int channel, int note)
633- {
634- std::vector<MIDI_Event>::iterator it = midi_channels[channel].events .end ();
635- while (it != midi_channels[channel].events .begin ())
636- {
637- it --;
638- if (it->note == note && isnan (it->end_time ))
639- {
640- return it;
641- }
642- }
643-
644- return it;
645- }
646-
647648static void parser_events (MidiEvent * events)
648649{
649650 if (events)
@@ -679,10 +680,11 @@ static void parser_events(MidiEvent * events)
679680 }
680681 else if (type == ME_NOTEOFF)
681682 {
682- std::vector<MIDI_Event>::iterator it = find_last (ch, note);
683- if (it != midi_channels[ch].events .end ())
683+ if (midi_channels[ch].events .size () > 0 )
684684 {
685- it->end_time = (float )time / play_mode->rate ;
685+ std::vector<MIDI_Event>::iterator it = midi_channels[ch].events .end () - 1 ;
686+ if (isnan (it->end_time ))
687+ it->end_time = (float )time / play_mode->rate ;
686688 }
687689 }
688690 else if (type == ME_ALL_NOTES_OFF)
@@ -798,12 +800,14 @@ static void ctl_event(CtlEvent *e)
798800 switch (e->type )
799801 {
800802 case CTLE_NOW_LOADING: /* v1:filename */
803+ m_loading = true ;
801804 break ;
802805 case CTLE_LOADING_DONE: /* v1:0=success -1=error 1=terminated */
803806 if (e->v1 == 0 )
804807 {
805808 parser_events ((MidiEvent *)e->v2 );
806809 }
810+ m_loading = false ;
807811 break ;
808812 case CTLE_PLAY_START: /* v1:nsamples */
809813 m_running = true ;
@@ -1408,7 +1412,7 @@ static void ShowMediaScopeView(int index, ImVec2 pos, ImVec2 size)
14081412 if (!channel_data[i].m_wave .empty ())
14091413 {
14101414 ImGui::PushID (i);
1411- ImGui::PlotLines (" ##wave" float *)channel_data[i].m_wave .data , channel_data[i].m_wave .w , 0 , nullptr , -1.0 / AudioWaveScale , 1.0 / AudioWaveScale, channel_view_size, 4 , false , false );
1415+ ImGui::PlotLinesEx (" ##wave" float *)channel_data[i].m_wave .data , channel_data[i].m_wave .w , 0 , nullptr , -1.0 / AudioWaveScale , 1.0 / AudioWaveScale, channel_view_size, 4 , false , false );
14121416 ImGui::PopID ();
14131417 }
14141418 draw_list->AddRect (channel_min, channel_max, COL_SLIDER_HANDLE, 0 );
@@ -1561,7 +1565,7 @@ static void ShowMediaScopeView(int index, ImVec2 pos, ImVec2 size)
15611565 if (!channel_data[i].m_fft .empty ())
15621566 {
15631567 ImGui::PushID (i);
1564- ImGui::PlotLines (" ##fft" float *)channel_data[i].m_fft .data , channel_data[i].m_fft .w , 0 , nullptr , 0.0 , 1.0 / AudioFFTScale, channel_view_size, 4 , true , true );
1568+ ImGui::PlotLinesEx (" ##fft" float *)channel_data[i].m_fft .data , channel_data[i].m_fft .w , 0 , nullptr , 0.0 , 1.0 / AudioFFTScale, channel_view_size, 4 , true , true );
15651569 ImGui::PopID ();
15661570 }
15671571 draw_list->AddRect (channel_min, channel_max, COL_SLIDER_HANDLE, 0 );
@@ -1635,7 +1639,7 @@ static void ShowMediaScopeView(int index, ImVec2 pos, ImVec2 size)
16351639 ImGui::PushID (i);
16361640 ImGui::ImMat db_mat_inv = channel_data[i].m_db .clone ();
16371641 db_mat_inv += 90 .f ;
1638- ImGui::PlotLines (" ##db" float *)db_mat_inv.data , db_mat_inv.w , 0 , nullptr , 0 , 90 .f / AudioDBScale, channel_view_size, 4 , false , true );
1642+ ImGui::PlotLinesEx (" ##db" float *)db_mat_inv.data , db_mat_inv.w , 0 , nullptr , 0 , 90 .f / AudioDBScale, channel_view_size, 4 , false , true );
16391643 ImGui::PopID ();
16401644 }
16411645 draw_list->AddRect (channel_min, channel_max, COL_SLIDER_HANDLE, 0 );
@@ -2102,7 +2106,7 @@ bool Application_Frame(void * handle, bool app_will_quit)
21022106 ImGui::SetNextWindowPos (control_pos, ImGuiCond_Always);
21032107 if (ImGui::BeginChild (" ##Control_Panel_Window" false , ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings))
21042108 {
2105- ImGui::BeginDisabled (m_running);
2109+ ImGui::BeginDisabled (m_running || m_loading );
21062110 // File Dialog
21072111 if (ImGuiFileDialog::Instance ()->Display (" embedded" ImVec2 (0 ,0 ), ImVec2 (0 ,400 )))
21082112 {
@@ -2130,7 +2134,7 @@ bool Application_Frame(void * handle, bool app_will_quit)
21302134 ImGui::Separator ();
21312135 // Setting
21322136 // Select SoundFont
2133- ImGui::BeginDisabled (m_running);
2137+ ImGui::BeginDisabled (m_running || m_loading );
21342138 int _index = sf_index;
21352139 if (ImGui::Combo (" Select Sound Font" size ()))
21362140 {
@@ -2303,6 +2307,7 @@ bool Application_Frame(void * handle, bool app_will_quit)
23032307 ImGui::BeginDisabled (!midi_is_selected);
23042308 ImGui::SetWindowFontScale (2.0 );
23052309 ImGui::SetCursorScreenPos (control_view_pos + ImVec2 (20 + time_area_x, (control_view_size.y - 64 ) / 2 ));
2310+ ImGui::BeginDisabled (m_loading);
23062311 if (ImGui::Button (m_running ? (m_paused ? ICON_FA_PLAY : ICON_FA_PAUSE) : ICON_FA_PLAY " ##play_pause" ImVec2 (64 , 64 )))
23072312 {
23082313 if (!m_running)
@@ -2324,12 +2329,13 @@ bool Application_Frame(void * handle, bool app_will_quit)
23242329 ImGui::SetCursorScreenPos (control_view_pos + ImVec2 (20 + time_area_x + 64 , (control_view_size.y - 64 ) / 2 ));
23252330 if (ImGui::Button (ICON_FA_STOP " ##stop" ImVec2 (64 , 64 )))
23262331 {
2327- if (m_running) push_event (RC_STOP, 0 );
2332+ if (m_running || m_loading ) push_event (RC_STOP, 0 );
23282333 }
23292334 ImGui::ShowTooltipOnHover (" %s" " Stop"
23302335 ImGui::EndDisabled ();
2336+ ImGui::EndDisabled ();
23312337
2332- ImGui::BeginDisabled (m_running);
2338+ ImGui::BeginDisabled (m_running || m_loading );
23332339 ImGui::SetCursorScreenPos (control_view_pos + ImVec2 (20 + time_area_x + 64 + 64 , (control_view_size.y - 64 ) / 2 ));
23342340 if (ImGui::Button (ICON_FA_FLOPPY_DISK " ##save_to wav" ImVec2 (64 , 64 )))
23352341 {
@@ -2366,7 +2372,7 @@ bool Application_Frame(void * handle, bool app_will_quit)
23662372 ImGui::ColorSet tick_color = {white_color, white_color, white_color};
23672373 float knob_size = 84 .f ;
23682374 float knob_step = NAN;
2369- ImGui::BeginDisabled (!m_running);
2375+ ImGui::BeginDisabled (!m_running && !m_loading );
23702376 float main_volume = current_MFnode ? current_MFnode->master_volume : 0 ;
23712377 float drum_power = opt_drum_power;
23722378 float speed = current_MFnode ? current_MFnode->tempo_ratio : 0 ;
0 commit comments