mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-09 11:55:39 +00:00
Code Issues Projects Releases Wiki Activity

Renamed ProjectM class members to have m_ prefix.

Browse Source
This commit is contained in:
Kai Blaschke
2022-04-04 22:41:13 +02:00
parent 1385adb368
commit c9b8d5e76a
3 changed files with 356 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/libprojectM/KeyHandler.cpp
View File

@ -119,31 +119,31 @@ void ProjectM::default_key_handler(projectMEvent event, projectMKeycode keycode)
switch (keycode)
{
case PROJECTM_K_HOME:
if (renderer->showmenu) {
if (m_renderer->showmenu) {
if (!isTextInputActive()) {
selectPreset(0); // jump to top of presets.
}
else {
renderer->m_activePresetID = 1; // jump to top of search results.
selectPresetByName(renderer->m_presetList[0].name,true);
m_renderer->m_activePresetID = 1; // jump to top of search results.
selectPresetByName(m_renderer->m_presetList[0].name,true);
}
}
break;
case PROJECTM_K_END:
if (renderer->showmenu) {
if (m_renderer->showmenu) {
if (!isTextInputActive()) {
selectPreset(m_presetLoader->size() - 1); // jump to bottom of presets.
}
else {
renderer->m_activePresetID = renderer->m_presetList.size(); // jump to top of search results.
selectPresetByName(renderer->m_presetList[renderer->m_activePresetID - 1].name,true);
m_renderer->m_activePresetID = m_renderer->m_presetList.size(); // jump to top of search results.
selectPresetByName(m_renderer->m_presetList[m_renderer->m_activePresetID - 1].name,true);
}
}
break;
case PROJECTM_K_PAGEUP:
if (isTextInputActive()) break; // don't handle this key if search menu is up.
if (renderer->showmenu) {
int upPreset = m_presetPos->lastIndex() - (renderer->textMenuPageSize / 2.0f); // jump up by page size / 2
if (m_renderer->showmenu) {
int upPreset = m_presetPos->lastIndex() - (m_renderer->textMenuPageSize / 2.0f); // jump up by page size / 2
if (upPreset < 0) // handle lower boundary
upPreset = m_presetLoader->size() - 1;
selectPreset(upPreset); // jump up menu half a page.
@ -151,89 +151,91 @@ void ProjectM::default_key_handler(projectMEvent event, projectMKeycode keycode)
break;
case PROJECTM_K_PAGEDOWN:
if (isTextInputActive()) break; // don't handle this key if search menu is up.
if (renderer->showmenu) {
int downPreset = m_presetPos->lastIndex() + (renderer->textMenuPageSize / 2.0f); // jump down by page size / 2
if (m_renderer->showmenu) {
int downPreset = m_presetPos->lastIndex() + (m_renderer->textMenuPageSize / 2.0f); // jump down by page size / 2
if (static_cast<std::size_t>(downPreset) >= (m_presetLoader->size() - 1)) // handle upper boundary
downPreset = 0;
selectPreset(downPreset); // jump down menu half a page.
}
break;
case PROJECTM_K_UP:
if (renderer->showmenu) {
if (m_renderer->showmenu) {
selectPrevious(true);
}
else {
beatDetect->beatSensitivity += 0.01;
if (beatDetect->beatSensitivity > 5.0) beatDetect->beatSensitivity = 5.0;
renderer->setToastMessage("Beat Sensitivity: " + round_float(beatDetect->beatSensitivity));
m_beatDetect->beatSensitivity += 0.01;
if (m_beatDetect->beatSensitivity > 5.0)
m_beatDetect->beatSensitivity = 5.0;
m_renderer->setToastMessage("Beat Sensitivity: " + round_float(m_beatDetect->beatSensitivity));
}
break;
case PROJECTM_K_DOWN:
if (renderer->showmenu) {
if (m_renderer->showmenu) {
selectNext(true);
}
else {
beatDetect->beatSensitivity -= 0.01;
if (beatDetect->beatSensitivity < 0) beatDetect->beatSensitivity = 0;
renderer->setToastMessage("Beat Sensitivity: " + round_float(beatDetect->beatSensitivity));
m_beatDetect->beatSensitivity -= 0.01;
if (m_beatDetect->beatSensitivity < 0)
m_beatDetect->beatSensitivity = 0;
m_renderer->setToastMessage("Beat Sensitivity: " + round_float(m_beatDetect->beatSensitivity));
}
break;
case PROJECTM_K_h:
if (isTextInputActive(true)) break; // disable when searching.
renderer->showhelp = !renderer->showhelp;
renderer->showstats = false;
renderer->showmenu = false;
m_renderer->showhelp = !m_renderer->showhelp;
m_renderer->showstats = false;
m_renderer->showmenu = false;
break;
case PROJECTM_K_F1:
if (isTextInputActive(true)) break; // disable when searching.
renderer->showhelp = !renderer->showhelp;
renderer->showstats = false;
renderer->showmenu = false;
m_renderer->showhelp = !m_renderer->showhelp;
m_renderer->showstats = false;
m_renderer->showmenu = false;
break;
case PROJECTM_K_y:
if (isTextInputActive(true)) break; // disable when searching.
this->setShuffleEnabled(!this->isShuffleEnabled());
if (this->isShuffleEnabled()) {
renderer->setToastMessage("Shuffle Enabled");
m_renderer->setToastMessage("Shuffle Enabled");
}
else {
renderer->setToastMessage("Shuffle Disabled");
m_renderer->setToastMessage("Shuffle Disabled");
}
break;
case PROJECTM_K_F5:
if (isTextInputActive(true)) break; // disable when searching.
renderer->showfps = !renderer->showfps;
m_renderer->showfps = !m_renderer->showfps;
// Initialize counters and reset frame count.
renderer->lastTimeFPS = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
renderer->currentTimeFPS = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
renderer->totalframes = 0;
m_renderer->lastTimeFPS = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
m_renderer->currentTimeFPS = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
m_renderer->totalframes = 0;
// Hide preset name from screen and replace it with FPS counter.
if (renderer->showfps)
if (m_renderer->showfps)
{
renderer->showpreset = false;
m_renderer->showpreset = false;
}
break;
case PROJECTM_K_F4:
if (isTextInputActive(true)) break; // disable when searching.
renderer->showstats = !renderer->showstats;
if (renderer->showstats) {
renderer->showhelp = false;
renderer->showmenu = false;
m_renderer->showstats = !m_renderer->showstats;
if (m_renderer->showstats) {
m_renderer->showhelp = false;
m_renderer->showmenu = false;
}
break;
case PROJECTM_K_F3: {
if (isTextInputActive(true)) break; // disable when searching.
renderer->showpreset = !renderer->showpreset;
m_renderer->showpreset = !m_renderer->showpreset;
// Hide FPS from screen and replace it with preset name.
if (renderer->showpreset)
if (m_renderer->showpreset)
{
renderer->showsearch = false;
renderer->showfps = false;
m_renderer->showsearch = false;
m_renderer->showfps = false;
}
break;
}
case PROJECTM_K_F2:
renderer->showtitle = !renderer->showtitle;
m_renderer->showtitle = !m_renderer->showtitle;
break;
#ifndef MACOS
case PROJECTM_K_F9:
@ -241,41 +243,41 @@ void ProjectM::default_key_handler(projectMEvent event, projectMKeycode keycode)
case PROJECTM_K_F8:
#endif
renderer->studio = !renderer->studio;
m_renderer->studio = !m_renderer->studio;
break;
case PROJECTM_K_ESCAPE: {
renderer->showsearch = false; // hide input menu
setShuffleEnabled(renderer->shuffletrack); // restore shuffle
renderer->showmenu = false; // hide input
m_renderer->showsearch = false; // hide input menu
setShuffleEnabled(m_renderer->shuffletrack); // restore shuffle
m_renderer->showmenu = false; // hide input
break;
}
case PROJECTM_K_f:
break;
case PROJECTM_K_a:
renderer->correction = !renderer->correction;
m_renderer->correction = !m_renderer->correction;
break;
case PROJECTM_K_b:
break;
case PROJECTM_K_H:
case PROJECTM_K_m:
if (isTextInputActive(true)) break; // disable when searching.
renderer->showmenu = !renderer->showmenu;
if (renderer->showmenu) {
renderer->showfps = false;
renderer->showhelp = false;
renderer->showstats = false;
m_renderer->showmenu = !m_renderer->showmenu;
if (m_renderer->showmenu) {
m_renderer->showfps = false;
m_renderer->showhelp = false;
m_renderer->showstats = false;
populatePresetMenu();
}
break;
case PROJECTM_K_M:
if (isTextInputActive(true)) break; // disable when searching.
renderer->showmenu = !renderer->showmenu;
if (renderer->showmenu)
m_renderer->showmenu = !m_renderer->showmenu;
if (m_renderer->showmenu)
{
renderer->showhelp = false;
renderer->showstats = false;
m_renderer->showhelp = false;
m_renderer->showstats = false;
populatePresetMenu();
}
break;
@ -307,26 +309,26 @@ void ProjectM::default_key_handler(projectMEvent event, projectMKeycode keycode)
setPresetLock(!isPresetLocked());
break;
case PROJECTM_K_s:
renderer->studio = !renderer->studio;
m_renderer->studio = !m_renderer->studio;
case PROJECTM_K_i:
break;
case PROJECTM_K_d: // d stands for write DEBUG output.
renderer->writeNextFrameToFile = true;
m_renderer->writeNextFrameToFile = true;
break;
case PROJECTM_K_RETURN:
renderer->toggleSearchText();
if (renderer->showsearch) {
renderer->shuffletrack = this->isShuffleEnabled(); // track previous shuffle state.
m_renderer->toggleSearchText();
if (m_renderer->showsearch) {
m_renderer->shuffletrack = this->isShuffleEnabled(); // track previous shuffle state.
setShuffleEnabled(false); // disable shuffle
renderer->showhelp = false;
renderer->showstats = false;
renderer->showtitle = false;
renderer->showpreset = false;
renderer->showmenu = true;
m_renderer->showhelp = false;
m_renderer->showstats = false;
m_renderer->showtitle = false;
m_renderer->showpreset = false;
m_renderer->showmenu = true;
populatePresetMenu();
} else {
setShuffleEnabled(renderer->shuffletrack); // restore shuffle
renderer->showmenu = false;
setShuffleEnabled(m_renderer->shuffletrack); // restore shuffle
m_renderer->showmenu = false;
}
break;
case PROJECTM_K_0: