Skip to content

Commit

Permalink
'dev'->'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@peetonn
peetonn committed Jul 29, 2015
2 parents 9c4c79c + ee227d4 commit 3cb9df2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 39 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.5.1</string>
<string>0.5.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>12</string>
<string>13</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.video</string>
<key>LSMinimumSystemVersion</key>
Expand Down
53 changes: 24 additions & 29 deletions ndncon/NCGeneralPreferencesView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NCGeneralPreferencesViewController">
<connections>
<outlet property="connectionStatusLabel" destination="zot-P1-b62" id="YCP-EP-ybe"/>
<outlet property="daemonHostTextField" destination="LfE-W8-X8f" id="9nu-eJ-TaO"/>
<outlet property="daemonPortTextField" destination="RJ3-RB-Agd" id="afK-NF-85i"/>
<outlet property="daemonStatusLabel" destination="zot-P1-b62" id="d3d-VP-hvW"/>
<outlet property="fullPrefixLabel" destination="OQF-nH-L0L" id="LQg-4t-gPO"/>
<outlet property="prefixTextField" destination="RmV-eJ-bZU" id="BsS-nD-ZRl"/>
<outlet property="usernameTextField" destination="KB2-db-WYC" id="XY6-9l-0G6"/>
<outlet property="view" destination="c22-O7-iKe" id="JRb-jb-yoz"/>
</connections>
</customObject>
Expand All @@ -23,8 +18,8 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="c22-O7-iKe">
<rect key="frame" x="0.0" y="0.0" width="480" height="288"/>
<subviews>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KB2-db-WYC">
<rect key="frame" x="240" y="246" width="196" height="22"/>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KB2-db-WYC">
<rect key="frame" x="240" y="246" width="179" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="testuser" drawsBackground="YES" id="vuZ-ok-qka">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -34,16 +29,16 @@
<binding destination="-2" name="value" keyPath="self.preferences.userName" id="bv0-pb-bgs"/>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QWv-LH-3Fu">
<rect key="frame" x="65" y="248" width="169" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QWv-LH-3Fu">
<rect key="frame" x="68" y="248" width="166" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Your NDN-RTC username:" id="Js9-ff-Sak">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RmV-eJ-bZU">
<rect key="frame" x="240" y="209" width="196" height="22"/>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RmV-eJ-bZU">
<rect key="frame" x="240" y="209" width="179" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="/ndn/edu/ucla/remap" drawsBackground="YES" id="KuA-2w-ydy">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -53,24 +48,24 @@
<binding destination="-2" name="value" keyPath="self.preferences.prefix" id="pU7-WV-5kD"/>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y6K-6g-ewH">
<rect key="frame" x="86" y="211" width="148" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Y6K-6g-ewH">
<rect key="frame" x="91" y="211" width="143" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="NDN publishing prefix:" id="knE-8M-az1">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XiK-np-SUo">
<rect key="frame" x="53" y="164" width="181" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XiK-np-SUo">
<rect key="frame" x="59" y="164" width="175" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="NDN-RTC publishing prefix:" id="hcu-FI-hyp">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LfE-W8-X8f">
<rect key="frame" x="240" y="123" width="196" height="22"/>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LfE-W8-X8f">
<rect key="frame" x="240" y="123" width="179" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="localhost" drawsBackground="YES" id="1ba-gw-byx">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -80,16 +75,16 @@
<binding destination="-2" name="value" keyPath="self.preferences.daemonHost" id="EcK-wY-Uxk"/>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yBA-3U-BHe">
<rect key="frame" x="89" y="125" width="145" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yBA-3U-BHe">
<rect key="frame" x="90" y="125" width="144" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="NDN daemon address:" id="uHC-A1-St8">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RJ3-RB-Agd">
<rect key="frame" x="240" y="86" width="196" height="22"/>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RJ3-RB-Agd">
<rect key="frame" x="240" y="86" width="179" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="6363" drawsBackground="YES" id="bEJ-MX-P92">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -103,8 +98,8 @@
</binding>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yhZ-Dh-NB6">
<rect key="frame" x="111" y="88" width="123" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yhZ-Dh-NB6">
<rect key="frame" x="114" y="88" width="120" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="NDN daemon port:" id="uMo-8h-39G">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -119,8 +114,8 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OQF-nH-L0L">
<rect key="frame" x="238" y="160" width="200" height="34"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OQF-nH-L0L">
<rect key="frame" x="238" y="160" width="183" height="34"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="/ndn/edu/ucla/remap/ndnrtc/user/testuser" id="94l-hv-7O7">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlDarkShadowColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -139,8 +134,8 @@
</binding>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zot-P1-b62">
<rect key="frame" x="238" y="54" width="200" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zot-P1-b62">
<rect key="frame" x="238" y="54" width="183" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="disconnected" id="5Bu-Il-3fo">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlDarkShadowColor" catalog="System" colorSpace="catalog"/>
Expand Down
14 changes: 7 additions & 7 deletions ndncon/settings.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<key>General</key>
<dict>
<key>Log level</key>
<string>all</string>
<string>default</string>
<key>Use TLV</key>
<true/>
<key>Retransmissions enabled</key>
Expand Down Expand Up @@ -158,15 +158,15 @@
<key>GOP</key>
<integer>30</integer>
<key>Start bitrate</key>
<integer>500</integer>
<integer>800</integer>
<key>Max bitrate</key>
<integer>0</integer>
<key>Drop frames</key>
<true/>
<key>Encoding width</key>
<integer>640</integer>
<integer>960</integer>
<key>Encoding height</key>
<integer>480</integer>
<integer>540</integer>
</dict>
<dict>
<key>Name</key>
Expand All @@ -176,15 +176,15 @@
<key>GOP</key>
<integer>30</integer>
<key>Start bitrate</key>
<integer>1000</integer>
<integer>1500</integer>
<key>Max bitrate</key>
<integer>0</integer>
<key>Drop frames</key>
<true/>
<key>Encoding width</key>
<integer>640</integer>
<integer>1280</integer>
<key>Encoding height</key>
<integer>480</integer>
<integer>720</integer>
</dict>
</array>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/ptnstorage/PTNStorage.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ -(void)updateDefaults
withMissingValuesFromDictionary:paramDictionary[key]];

[_defaultParams removeObjectForKey:key];
[_defaultParams registerDefaults:@{key:defaultParam}];
[self saveParam:defaultParam forKey:key];
}
}
}
Expand Down

0 comments on commit 3cb9df2

Please sign in to comment.