History

Merge pull request #779 from birarda/rave-audio

fix resetting of song mix menu item after import is done

ZappoMan committed 13 years ago

Commit fe877b02 parents 461bf00 25537f73 files · +16 −6Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+10−2
@@ -2128,13 +2128,21 @@ void Application::toggleMixedSong() { · 2127 unmodified lines
21282128
21292129 QByteArray filenameArray = filename.toLocal8Bit();
21302130 _audio.importSongToMixWithMicrophone(filenameArray.data());
2131− _rawAudioMicrophoneMix->setText("Stop Mixing Song");
2131+ resetSongMixMenuItem();
21322132 } else {
21332133 _audio.stopMixingSongWithMicrophone();
2134− _rawAudioMicrophoneMix->setText("Mix RAW Song");
2134+ resetSongMixMenuItem();
21352135 }
21362136 }
21372137
2138+void Application::resetSongMixMenuItem() {
2139+ if (_audio.getSongFileBytes() == 0) {
2140+ _rawAudioMicrophoneMix->setText("Mix RAW Song");
2141+ } else {
2142+ _rawAudioMicrophoneMix->setText("Stop Mixing Song");
2143+ }
2144+
2145+}
21382146
21392147 void Application::updateFrustumRenderModeAction() {
21402148 switch (_frustumDrawingMode) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t