diff --git a/Icon/midi-osc-midi.ico b/Icon/midi-osc-midi.ico deleted file mode 100644 index e250744..0000000 Binary files a/Icon/midi-osc-midi.ico and /dev/null differ diff --git a/bin/data/MIDI_OSC_SETTINGS.json b/bin/data/MIDI_OSC_SETTINGS.json index ee39ad1..6947447 100644 --- a/bin/data/MIDI_OSC_SETTINGS.json +++ b/bin/data/MIDI_OSC_SETTINGS.json @@ -1,21 +1,30 @@ { "Log_level": 0, "allInPorts": [ - "IAC Driver Bus 1", - "Euphonix MIDI Euphonix Port 1", - "Euphonix MIDI Euphonix Port 2", - "Euphonix MIDI Euphonix Port 3", - "Euphonix MIDI Euphonix Port 4" + "Euphonix EuMidi1 0", + "Euphonix EuMidi2 1", + "Euphonix EuMidi3 2", + "Euphonix EuMidi4 3", + "Euphonix EuMidi5 4", + "Euphonix EuMidi6 5", + "Euphonix EuMidi7 6", + "Euphonix EuMidi8 7", + "loopMIDI Port 8" ], "allOutPorts": [ - "IAC Driver Bus 1", - "Euphonix MIDI Euphonix Port 1", - "Euphonix MIDI Euphonix Port 2", - "Euphonix MIDI Euphonix Port 3", - "Euphonix MIDI Euphonix Port 4" + "Microsoft GS Wavetable Synth 0", + "Euphonix EuMidi1 1", + "Euphonix EuMidi2 2", + "Euphonix EuMidi3 3", + "Euphonix EuMidi4 4", + "Euphonix EuMidi5 5", + "Euphonix EuMidi6 6", + "Euphonix EuMidi7 7", + "Euphonix EuMidi8 8", + "loopMIDI Port 9" ], "frameRate": 25, - "inPortLabel": "IAC Driver Bus 1", + "inPortLabel": "Euphonix EuMidi1 0", "incomingPortOsc": 1233, "midiInChannel": 1, "midiInDevice": "IAC Driver Bus 1", @@ -29,7 +38,7 @@ "midiOutDeviceName": null, "midiOutDeviceNum": 0, "outGoingPortOsc": 1234, - "outPortLabel": "IAC Driver Bus 1", + "outPortLabel": "Microsoft GS Wavetable Synth 0", "outgoingIpOSC": "127.0.0.1", "useVirtualPort": false } \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 7c2afe0..f8e4db9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,14 @@ + #include "ofMain.h" #include "ofApp.h" + +#ifdef TARGET_WIN32 + +#define IDI_ICON1 101 + +#endif + //======================================================================== int main( ){ @@ -11,6 +19,13 @@ int main( ){ auto window = ofCreateWindow(settings); +#ifdef TARGET_WIN32 + HWND hwnd = ofGetWin32Window(); + // Load and set the application icon + HICON hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON1)); + SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon); // Set the large icon + SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); // Set the small icon +#endif ofRunApp(window, std::make_shared()); ofRunMainLoop();