Skip to content

Commit

Permalink
'dev'->'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@peetonn
peetonn committed Mar 9, 2016
2 parents fabaa42 + 82957f8 commit 90111ed
Show file tree
Hide file tree
Showing 17 changed files with 464 additions and 129 deletions.
4 changes: 2 additions & 2 deletions NdnCon copy-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.7.5</string>
<string>0.7.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>35</string>
<string>36</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.video</string>
<key>LSMinimumSystemVersion</key>
Expand Down
8 changes: 8 additions & 0 deletions NdnCon.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
AF09040C1C8F752E00914A3C /* NCStatisticCollector.mm in Sources */ = {isa = PBXBuildFile; fileRef = AF09040B1C8F752E00914A3C /* NCStatisticCollector.mm */; };
AF09040D1C8F752E00914A3C /* NCStatisticCollector.mm in Sources */ = {isa = PBXBuildFile; fileRef = AF09040B1C8F752E00914A3C /* NCStatisticCollector.mm */; };
AF11BAFB19D4E37E0011270F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF11BAFA19D4E37E0011270F /* OpenGL.framework */; };
AF241DA71AEB2C5B000CA14A /* NCSessionInfoContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = AF241DA61AEB2C5B000CA14A /* NCSessionInfoContainer.mm */; };
AF241DA81AEB2C5B000CA14A /* NCSessionInfoContainer.mm in Sources */ = {isa = PBXBuildFile; fileRef = AF241DA61AEB2C5B000CA14A /* NCSessionInfoContainer.mm */; };
Expand Down Expand Up @@ -266,6 +268,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
AF09040A1C8F752E00914A3C /* NCStatisticCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NCStatisticCollector.h; path = ndncon/NCStatisticCollector.h; sourceTree = SOURCE_ROOT; };
AF09040B1C8F752E00914A3C /* NCStatisticCollector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NCStatisticCollector.mm; path = ndncon/NCStatisticCollector.mm; sourceTree = SOURCE_ROOT; };
AF11BAFA19D4E37E0011270F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
AF241DA51AEB2C5B000CA14A /* NCSessionInfoContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NCSessionInfoContainer.h; path = ndncon/NCSessionInfoContainer.h; sourceTree = SOURCE_ROOT; };
AF241DA61AEB2C5B000CA14A /* NCSessionInfoContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NCSessionInfoContainer.mm; path = ndncon/NCSessionInfoContainer.mm; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -616,6 +620,8 @@
children = (
AF6D91FD1B4DBD6100F8F4E0 /* NCStreamingController.h */,
AF6D91FE1B4DBD6100F8F4E0 /* NCStreamingController.m */,
AF09040A1C8F752E00914A3C /* NCStatisticCollector.h */,
AF09040B1C8F752E00914A3C /* NCStatisticCollector.mm */,
);
name = "Streaming controller";
sourceTree = "<group>";
Expand Down Expand Up @@ -1285,6 +1291,7 @@
AFA8521719C8B2FF0015A883 /* NCEmbeddedScrollView.m in Sources */,
AF5D34AB19DA52E400227E75 /* NCClickableView.m in Sources */,
AFA8521419C8A6060015A883 /* NSObject+NCAdditions.m in Sources */,
AF09040C1C8F752E00914A3C /* NCStatisticCollector.mm in Sources */,
AFC99BF319D29B67005B75AB /* NSDictionary+NCNdnRtcAdditions.mm in Sources */,
AF5D34AE19DB7B4700227E75 /* NSString+NCAdditions.mm in Sources */,
AFB35C0E19CA095100D8A2BC /* NCStreamPreviewController.m in Sources */,
Expand Down Expand Up @@ -1365,6 +1372,7 @@
AFDD0DDB1A7318380076A301 /* NCEmbeddedScrollView.m in Sources */,
AFDD0DDD1A7318380076A301 /* NCClickableView.m in Sources */,
AFDD0DDE1A7318380076A301 /* NSObject+NCAdditions.m in Sources */,
AF09040D1C8F752E00914A3C /* NCStatisticCollector.mm in Sources */,
AF4258981AB3B887004C726B /* FTPManager.m in Sources */,
AFDD0DDF1A7318380076A301 /* NSDictionary+NCNdnRtcAdditions.mm in Sources */,
AFDD0DE01A7318380076A301 /* NSString+NCAdditions.mm in Sources */,
Expand Down
47 changes: 42 additions & 5 deletions NdnCon.xcodeproj/xcshareddata/xcschemes/NdnCon.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -66,16 +66,19 @@
ReferencedContainer = "container:NdnCon.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
debugServiceExtension = "internal"
allowLocationSimulation = "NO">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
Expand All @@ -86,6 +89,40 @@
ReferencedContainer = "container:NdnCon.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-auto-fetch-user remap"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-auto-publish-user test2"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-auto-fetch-video 1"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-auto-fetch-prefix /ndn/edu/ucla/remap"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-auto-publish-prefix /ndn/edu/ucla/remap"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-auto-publish-audio 1"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-auto-publish-video 1"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-reset-settings 1"
isEnabled = "NO">
</CommandLineArgument>
</CommandLineArguments>
<EnvironmentVariables>
<EnvironmentVariable
key = "MallocStackLoggingNoCompact"
Expand All @@ -102,10 +139,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
6 changes: 5 additions & 1 deletion ndncon/AppDelegate.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSConstraintBasedLayoutVisualizeMutuallyExclusiveConstraints"];
NSLog(@"%@ v%@", [NCPreferencesController sharedInstance].appName, [NCPreferencesController sharedInstance].versionString);
#endif
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *resetSettings = [defaults stringForKey:@"reset-settings"];

if (resetSettings)
[[NCPreferencesController sharedInstance] resetDefaults];

// [[NCPreferencesController sharedInstance] resetDefaults];
if ([NCPreferencesController sharedInstance].isFirstLaunch)
{
NSLog(@"First launch indeed!");
Expand Down
20 changes: 9 additions & 11 deletions ndncon/Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="14F1605" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
Expand All @@ -17,7 +17,6 @@
<outlet property="activeStreamViewerContainer" destination="jBg-08-9BM" id="aVH-hp-OvU"/>
<outlet property="chatContentView" destination="oWk-sF-qhk" id="bD3-ah-yIP"/>
<outlet property="chatroomPopup" destination="vyE-i9-CqJ" id="X3m-xN-7AT"/>
<outlet property="createChatroomButton" destination="YHM-mW-0d4" id="Azq-wu-IuB"/>
<outlet property="localStreamsScrollView" destination="dlc-cC-15F" id="LBf-qz-Yiq"/>
<outlet property="muteButtonsView" destination="sWO-1W-aga" id="2ud-WD-1RX"/>
<outlet property="noFetchingView" destination="TEV-7R-2BF" id="W4G-Av-OzT"/>
Expand Down Expand Up @@ -833,12 +832,12 @@ CA
<subviews>
<popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vyE-i9-CqJ">
<rect key="frame" x="18" y="136" width="200" height="26"/>
<popUpButtonCell key="cell" type="push" title="&lt;select chatroom&gt;" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Jbu-B6-cnT" id="Pev-e2-Oln" userLabel="Select chatroom">
<popUpButtonCell key="cell" type="push" title="&lt;no chatroom selected&gt;" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Jbu-B6-cnT" id="Pev-e2-Oln" userLabel="Select chatroom">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" id="6cF-JN-EwG">
<items>
<menuItem title="&lt;select chatroom&gt;" state="on" id="Jbu-B6-cnT"/>
<menuItem title="&lt;no chatroom selected&gt;" state="on" id="Jbu-B6-cnT"/>
<menuItem title="dynamically replaced" tag="1" id="9mU-oq-2hM">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
Expand All @@ -861,7 +860,7 @@ CA
</popUpButton>
<button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YHM-mW-0d4" customClass="NCToggleButton">
<rect key="frame" x="20" y="76" width="195" height="25"/>
<buttonCell key="cell" type="square" title="Create chatroom" bezelStyle="shadowlessSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="DDi-rD-Yak">
<buttonCell key="cell" type="square" title="Create chatroom" alternateTitle="Leave chatroom" bezelStyle="shadowlessSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="DDi-rD-Yak">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand All @@ -871,9 +870,8 @@ CA
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="createChatroom:" target="q0s-gL-KLj" id="wLk-sM-Lbb"/>
<binding destination="q0s-gL-KLj" name="value" keyPath="self.isPublishingChatroom" id="AcS-of-EOB"/>
<binding destination="q0s-gL-KLj" name="enabled" keyPath="self.publishedChatroomName.length" id="JdF-1g-9Xt"/>
<action selector="toggleChatroom:" target="q0s-gL-KLj" id="Otw-42-WPf"/>
<binding destination="q0s-gL-KLj" name="value" keyPath="self.isJoinedChatroom" id="4jL-Sh-0DT"/>
</connections>
</button>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hBX-7Y-dvs">
Expand Down Expand Up @@ -1144,7 +1142,7 @@ CA
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Ccd-Oc-lWv">
<rect key="frame" x="0.0" y="0.0" width="177" height="100"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fMC-HZ-SA4">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fMC-HZ-SA4">
<rect key="frame" x="18" y="62" width="141" height="28"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="you are not publishing any media" id="IbM-1S-EEo">
<font key="font" metaFont="smallSystem"/>
Expand Down Expand Up @@ -1235,7 +1233,7 @@ CA
<customView translatesAutoresizingMaskIntoConstraints="NO" id="TEV-7R-2BF">
<rect key="frame" x="0.0" y="0.0" width="177" height="100"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IX1-EF-18I">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IX1-EF-18I">
<rect key="frame" x="18" y="36" width="141" height="28"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="you are not fetching any media" id="9Yq-to-gEo">
<font key="font" metaFont="smallSystem"/>
Expand Down
6 changes: 3 additions & 3 deletions ndncon/NCAdvancedPreferencesView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="14F1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="14F1605" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NCAdvancedPreferencesViewController">
Expand Down Expand Up @@ -36,7 +36,7 @@
<rect key="frame" x="1" y="1" width="248" height="490"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="oin-wn-GBL">
<tableView appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="oin-wn-GBL">
<rect key="frame" x="0.0" y="0.0" width="253" height="490"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
Expand Down
Loading

0 comments on commit 90111ed

Please sign in to comment.