added npath and nloadlib to stop CPU spike at load; added ~/pd/ and ~/Library/Pd for user-specific install paths. What to do on Windows...

svn path=/trunk/; revision=9817

4 files changed, 22 insertions, 11 deletions

diff --git a/packages/darwin_app/org.puredata.pd.default.plist b/packages/darwin_app/org.puredata.pd.default.plist
index 45c24908..b2f081e8 100644
--- a/packages/darwin_app/org.puredata.pd.default.plist
+++ b/packages/darwin_app/org.puredata.pd.default.plist
@@ -84,24 +84,30 @@
 	<string>pdp</string>
 	<key>loadlib39</key>
 	<string>pidip</string>
+	<key>nloadlib</key>
+	<string>39</string>
 	<key>path1</key>
-	<string>/Library/Pd</string>
+	<string>~/Library/Pd</string>
 	<key>path2</key>
-	<string>/System/Library/Fonts</string>
+	<string>/Library/Pd</string>
 	<key>path3</key>
-	<string>/Library/Fonts</string>
+	<string>/System/Library/Fonts</string>
 	<key>path4</key>
-	<string>~/Library/Fonts</string>
+	<string>/Library/Fonts</string>
 	<key>path5</key>
-	<string>/usr/X11R6/lib/X11/fonts/TTF</string>
+	<string>~/Library/Fonts</string>
 	<key>path6</key>
-	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
+	<string>/usr/X11R6/lib/X11/fonts/TTF</string>
 	<key>path7</key>
-	<string>/sw/lib/X11/fonts/msttf</string>
+	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
 	<key>path8</key>
-	<string>/sw/lib/X11/fonts/intl/TrueType</string>
+	<string>/sw/lib/X11/fonts/msttf</string>
 	<key>path9</key>
+	<string>/sw/lib/X11/fonts/intl/TrueType</string>
+	<key>path10</key>
 	<string>/sw/lib/X11/fonts/applettf</string>
+	<key>npath</key>
+	<string>10</string>
 </dict>
  </plist>
 
diff --git a/packages/linux_make/default.pdsettings b/packages/linux_make/default.pdsettings
index 7f0b286a..568e4619 100644
--- a/packages/linux_make/default.pdsettings
+++ b/packages/linux_make/default.pdsettings
@@ -41,6 +41,8 @@ loadlib36: flatspace
 loadlib37: deprecated
 loadlib38: pdp
 loadlib39: pidip
-path1: /usr/share/pd
-path2: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
 nloadlib: 39
+path1: ~/pd
+path2: /usr/share/pd
+path3: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
+npath: 3
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index d8024541..6fbc7fd4 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -66,7 +66,6 @@ Root: HKCR; SubKey: .pd; ValueType: string; ValueData: Pure.Data; Flags: noerror
 Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: noerror uninsdeletekey; Tasks: fileassociations

 ;

 ; add pd-inno_registry after this comment:

-

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: Gem; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: cyclone; Tasks: libs

@@ -104,6 +103,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueD
 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: ekext; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib36; ValueData: flatspace; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib37; ValueData: deprecated; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 37; Tasks: libs; Flags: uninsdeletekey

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib38; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib39; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib40; Flags: deletevalue; Tasks: libs

@@ -168,6 +168,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib98; Flags: d
 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib99; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib100; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path1; ValueData: hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00; Tasks: libs; Flags: uninsdeletekey

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 1; Tasks: libs; Flags: uninsdeletekey

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path2; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path3; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs

diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index 2a0ad767..ed72e272 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -38,6 +38,7 @@ Windows Registry Editor Version 5.00
 "loadlib35"="ekext"
 "loadlib36"="flatspace"
 "loadlib37"="deprecated"
+"nloadlib"=37
 ; delete any previous loadlib flags
 "loadlib38"=-
 "loadlib39"=-
@@ -103,6 +104,7 @@ Windows Registry Editor Version 5.00
 "loadlib99"=-
 "loadlib100"=-
 "path1"=hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00
+"npath"=1
 ; delete all existing path flags
 "path2"=-
 "path3"=-