History

Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo

Stephen Birarda committed 12 years ago

Commit beb7c332 parents 0f32346 f29a41822 files · +139 −34Browse files

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

Unified · Split

interface/src/Application.cpp+3−0
@@ -416,6 +416,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 415 unmodified lines
416 416
417 _trayIcon->show();417 _trayIcon->show();
418 418
419 // set the local loopback interface for local sounds from audio scripts
420 AudioScriptingInterface::getInstance().setLocalLoopbackInterface(&_audio);
421
419#ifdef HAVE_RTMIDI422#ifdef HAVE_RTMIDI
420 // setup the MIDIManager423 // setup the MIDIManager
421 MIDIManager& midiManagerInstance = MIDIManager::getInstance();424 MIDIManager& midiManagerInstance = MIDIManager::getInstance();

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