Skip to content

Commit babc2b5

Browse files
mrRaymrRay
committed
updates and cleanup
added sparkle, cleaned up some warnings, updated the local osc/midi frameworks
1 parent 4e71c6b commit babc2b5

File tree

209 files changed

+1648
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+1648
-245
lines changed

‎LiveOSCQueryHelper/Base.lproj/MainMenu.xib‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
66
<capability name="box content view" minToolsVersion="7.0"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
@@ -37,6 +37,12 @@
3737
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
3838
</connections>
3939
</menuItem>
40+
<menuItem title="Check for Updates..." id="zVf-53-dfB">
41+
<modifierMask key="keyEquivalentModifierMask"/>
42+
<connections>
43+
<action selector="checkForUpdates:" target="ssG-Gs-2Gq" id="xKi-Wc-IaJ"/>
44+
</connections>
45+
</menuItem>
4046
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
4147
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
4248
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
@@ -843,5 +849,6 @@ If LOQH is running, the OSC query server is running- you can check it with any O
843849
</connections>
844850
</customObject>
845851
<customObject id="2V1-RW-p5z" userLabel="MIDI Manager" customClass="LOQHMIDIManager"/>
852+
<customObject id="ssG-Gs-2Gq" customClass="SUUpdater"/>
846853
</objects>
847854
</document>

‎LiveOSCQueryHelper/Info.plist‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<key>CFBundlePackageType</key>
4545
<string>APPL</string>
4646
<key>CFBundleShortVersionString</key>
47-
<string>0.3.0.3</string>
47+
<string>0.3.0.4</string>
4848
<key>CFBundleVersion</key>
49-
<string>1</string>
49+
<string>0.3.0.4</string>
5050
<key>LSMinimumSystemVersion</key>
5151
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
5252
<key>NSHumanReadableCopyright</key>
@@ -55,5 +55,7 @@
5555
<string>MainMenu</string>
5656
<key>NSPrincipalClass</key>
5757
<string>NSApplication</string>
58+
<key>SUFeedURL</key>
59+
<string>https://www.vidvox.net/version/LiveOSCQueryHelper.xml</string>
5860
</dict>
5961
</plist>

‎LiveOSCQueryHelper/LOQHOSCManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ - (void) setPortInt:(int)inPortInt {
3737
//int newPortInt = [tmpPort port];
3838
NSString *newPortString = [NSString stringWithFormat:@"%d",[tmpPort port]];
3939
dispatch_async(dispatch_get_main_queue(), ^{
40-
if (![[portField stringValue] isEqualToString:newPortString])
41-
[portField setStringValue:newPortString];
40+
if (![[self->portField stringValue] isEqualToString:newPortString])
41+
[self->portField setStringValue:newPortString];
4242
});
4343
}
4444
- (NSDictionary *) oscQueryHostInfo {

‎LiveOSCQueryHelper/LiveOSCQueryHelperAppDelegate.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ - (void) _loadAbletonProjectFile:(NSString *)fullPath {
361361
[newNode setOverloads:objOverloads];
362362

363363
// make a delegate for the node, add it to the array
364-
QueryServerNodeDelegate *tmpDelegate = [[QueryServerNodeDelegate alloc] initWithMIDIManager:midim forAddress:[newNode fullName]];
364+
QueryServerNodeDelegate *tmpDelegate = [[QueryServerNodeDelegate alloc] initWithMIDIManager:self->midim forAddress:[newNode fullName]];
365365
[tmpDelegate setMIDIMsgType:objMIDIMsgType];
366366
[tmpDelegate setMIDIChannel:[objMIDIChannelNum intValue]];
367367
[tmpDelegate setMIDIVoice:[objMIDIVoiceNum intValue]];
@@ -379,7 +379,7 @@ - (void) _loadAbletonProjectFile:(NSString *)fullPath {
379379
}
380380
}
381381
[newNode addDelegate:tmpDelegate];
382-
[delegates addObject:tmpDelegate];
382+
[self->delegates addObject:tmpDelegate];
383383
}
384384

385385
// run through the contents, calling this block recursively on each object
@@ -441,7 +441,7 @@ - (void) targetAppHostInfoChangedNotification:(NSNotification *)note {
441441
[server stop];
442442
// wait a bit before restarting it...
443443
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.25*NSEC_PER_SEC), dispatch_get_main_queue(), ^{
444-
[server start];
444+
[self->server start];
445445
// wait a bit more before updating the UI...
446446
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.25*NSEC_PER_SEC), dispatch_get_main_queue(), ^{
447447
[self _updateUIItems];

‎MIDIOSCQueryHelper/Base.lproj/MainMenu.xib‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
66
<capability name="box content view" minToolsVersion="7.0"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
@@ -37,6 +37,12 @@
3737
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
3838
</connections>
3939
</menuItem>
40+
<menuItem title="Check for Updates..." id="0US-oo-cFf">
41+
<modifierMask key="keyEquivalentModifierMask"/>
42+
<connections>
43+
<action selector="checkForUpdates:" target="8mj-CT-XO7" id="B2O-VZ-aC5"/>
44+
</connections>
45+
</menuItem>
4046
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
4147
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
4248
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
@@ -858,7 +864,7 @@
858864
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
859865
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="BOu-KW-Ryi">
860866
<font key="font" metaFont="system"/>
861-
<mutableString key="title">MIDI OSCQuery Helper ("MOQH" from now on) adds OSC and OSCQuery capabilities to other applications that only support MIDI.
867+
<string key="title">MIDI OSCQuery Helper ("MOQH" from now on) adds OSC and OSCQuery capabilities to other applications that only support MIDI.
862868

863869
- This app uses JSON files loaded into it to create an OSC address space.
864870
- This app runs an OSC query server- this query server publishes the details of the address space.
@@ -876,7 +882,7 @@ FILE TYPE:
876882
- JSON files can be imported- a sample file demonstrating the various basic MIDI data types is already installed on your machine in "~/Documents/MIDI OSCQuery Helper/SampleDocument.json". The JSON files that you import should have a structure similar to the desired output of the OSC query server- for more information, consult the OSC query protocol, defined here (https://github.com/mrRay/OSCQueryProposal). There are, however, several additional keys/values which must be used to indicate what sort of MIDI value should be sent- the query server will not publish any OSC nodes that are missing the following keys:
877883
- "MIDI_TYPE": The value stored at the key "MIDI_TYPE" must be one of the following strings: "NOTE", "AFTERTOUCH", "CC", "PGM", or "PITCH". This value indicates what kind of MIDI message should be sent when an OSC message is received by this node.
878884
- "MIDI_CHANNEL": The value stored at the key "MIDI_CHANNEL" must be an integer. This value describes the channel on which the MIDI message will be sent.
879-
- "MIDI_VOICE": The value stored at the key "MIDI_VOICE" must be an integer. This value describes which controller or note will be used to send the value from the OSC message.</mutableString>
885+
- "MIDI_VOICE": The value stored at the key "MIDI_VOICE" must be an integer. This value describes which controller or note will be used to send the value from the OSC message.</string>
880886
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
881887
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
882888
</textFieldCell>
@@ -906,5 +912,6 @@ FILE TYPE:
906912
<outlet property="selectedMIDIDstPUB" destination="K4S-Zc-C7y" id="Pcb-By-iBk"/>
907913
</connections>
908914
</customObject>
915+
<customObject id="8mj-CT-XO7" customClass="SUUpdater"/>
909916
</objects>
910917
</document>

‎MIDIOSCQueryHelper/Info.plist‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<key>CFBundlePackageType</key>
3535
<string>APPL</string>
3636
<key>CFBundleShortVersionString</key>
37-
<string>0.3.0.3</string>
37+
<string>0.3.0.4</string>
3838
<key>CFBundleVersion</key>
39-
<string>1</string>
39+
<string>0.3.0.4</string>
4040
<key>LSMinimumSystemVersion</key>
4141
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
4242
<key>NSHumanReadableCopyright</key>
@@ -45,5 +45,7 @@
4545
<string>MainMenu</string>
4646
<key>NSPrincipalClass</key>
4747
<string>NSApplication</string>
48+
<key>SUFeedURL</key>
49+
<string>https://www.vidvox.net/version/MIDIOSCQueryHelper.xml</string>
4850
</dict>
4951
</plist>

‎MIDIOSCQueryHelper/MIDIOSCQueryHelperAppDelegate.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ - (void) _loadJSONFile:(NSString *)fullPath {
384384
[newNode setOverloads:objOverloads];
385385

386386
// make a delegate for the node, add it to the array
387-
QueryServerNodeDelegate *tmpDelegate = [[QueryServerNodeDelegate alloc] initWithMIDIManager:midim forAddress:[newNode fullName]];
387+
QueryServerNodeDelegate *tmpDelegate = [[QueryServerNodeDelegate alloc] initWithMIDIManager:self->midim forAddress:[newNode fullName]];
388388
[tmpDelegate setMIDIMsgType:objMIDIMsgType];
389389
[tmpDelegate setMIDIChannel:[objMIDIChannelNum intValue]];
390390
[tmpDelegate setMIDIVoice:[objMIDIVoiceNum intValue]];
@@ -402,7 +402,7 @@ - (void) _loadJSONFile:(NSString *)fullPath {
402402
}
403403
}
404404
[newNode addDelegate:tmpDelegate];
405-
[delegates addObject:tmpDelegate];
405+
[self->delegates addObject:tmpDelegate];
406406
}
407407

408408
// run through the contents, calling this block recursively on each object
@@ -464,7 +464,7 @@ - (void) targetAppHostInfoChangedNotification:(NSNotification *)note {
464464
[server stop];
465465
// wait a bit before restarting it...
466466
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.25*NSEC_PER_SEC), dispatch_get_main_queue(), ^{
467-
[server start];
467+
[self->server start];
468468
// wait a bit more before updating the UI...
469469
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.25*NSEC_PER_SEC), dispatch_get_main_queue(), ^{
470470
[self _updateUIItems];

‎MIDIOSCQueryHelper/MOQHOSCManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ - (void) setPortInt:(int)inPortInt {
3737
//int newPortInt = [tmpPort port];
3838
NSString *newPortString = [NSString stringWithFormat:@"%d",[tmpPort port]];
3939
dispatch_async(dispatch_get_main_queue(), ^{
40-
if (![[portField stringValue] isEqualToString:newPortString])
41-
[portField setStringValue:newPortString];
40+
if (![[self->portField stringValue] isEqualToString:newPortString])
41+
[self->portField setStringValue:newPortString];
4242
});
4343
}
4444
- (NSDictionary *) oscQueryHostInfo {

‎OSCQueryHelper/Base.lproj/MainMenu.xib‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
66
<capability name="box content view" minToolsVersion="7.0"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
@@ -43,6 +43,12 @@
4343
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
4444
</connections>
4545
</menuItem>
46+
<menuItem title="Check for Updates..." id="vRZ-Al-Xyu">
47+
<modifierMask key="keyEquivalentModifierMask"/>
48+
<connections>
49+
<action selector="checkForUpdates:" target="Lqv-yL-l5q" id="g36-lS-Vav"/>
50+
</connections>
51+
</menuItem>
4652
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
4753
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
4854
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
@@ -913,5 +919,6 @@ FILE TYPE:
913919
</view>
914920
<point key="canvasLocation" x="304.5" y="414"/>
915921
</window>
922+
<customObject id="Lqv-yL-l5q" customClass="SUUpdater"/>
916923
</objects>
917924
</document>

‎OSCQueryHelper/Info.plist‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<key>CFBundlePackageType</key>
3737
<string>APPL</string>
3838
<key>CFBundleShortVersionString</key>
39-
<string>0.3.0.3</string>
39+
<string>0.3.0.4</string>
4040
<key>CFBundleVersion</key>
41-
<string>1</string>
41+
<string>0.3.0.4</string>
4242
<key>LSMinimumSystemVersion</key>
4343
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
4444
<key>NSHumanReadableCopyright</key>
@@ -47,5 +47,7 @@
4747
<string>MainMenu</string>
4848
<key>NSPrincipalClass</key>
4949
<string>NSApplication</string>
50+
<key>SUFeedURL</key>
51+
<string>https://www.vidvox.net/version/OSCQueryHelper.xml</string>
5052
</dict>
5153
</plist>

0 commit comments

Comments
 (0)