Shorten and Wavpack support added

2005-06-06 17:47:29 +00:00 · 2005-06-06 17:47:29 +00:00 · 074df8a833
parent e02b7f5d6a
commit 074df8a833
13 changed files with 1938 additions and 259 deletions
--- a/Cog.xcode/project.pbxproj
+++ b/Cog.xcode/project.pbxproj
@ -56,6 +56,8 @@
 //104
 		1058C7A0FEA54F0111CA2CBB = {
 			children = (
+				8E8BAE9C08548C6300E9F14D,
+				8E8BAE9808548C5500E9F14D,
 				8E14E468084CF15C00246BCC,
 				8E5A9031084CB48500AE6D62,
 				8E81BC31083673ED0025A375,
@ -326,7 +328,7 @@
 			buildRules = (
 			);
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "/Users/xugg/Projects/Cog/Libraries/DecMPA/build /Users/xugg/Projects/Cog/Libraries/FLAC/build /Users/xugg/Projects/Cog/Libraries/MAC/build /Users/xugg/Projects/Cog/Libraries/MPCDec/build /Users/xugg/Projects/Cog/Libraries/Ogg/build /Users/xugg/Projects/Cog/Libraries/SndFile/build /Users/xugg/Projects/Cog/Libraries/Vorbis/build /Users/xugg/Projects/Cog/Libraries/MetaTag/build /Users/xugg/Projects/Cog/Libraries/TagLib/build /Users/xugg/Projects/Cog/Libraries/FAAD2/build";
+				FRAMEWORK_SEARCH_PATHS = "/Users/xugg/Projects/Cog/Libraries/DecMPA/build /Users/xugg/Projects/Cog/Libraries/FLAC/build /Users/xugg/Projects/Cog/Libraries/MAC/build /Users/xugg/Projects/Cog/Libraries/MPCDec/build /Users/xugg/Projects/Cog/Libraries/Ogg/build /Users/xugg/Projects/Cog/Libraries/SndFile/build /Users/xugg/Projects/Cog/Libraries/Vorbis/build /Users/xugg/Projects/Cog/Libraries/MetaTag/build /Users/xugg/Projects/Cog/Libraries/TagLib/build /Users/xugg/Projects/Cog/Libraries/FAAD2/build /Users/xugg/Projects/Cog/Libraries/Shorten/build /Users/xugg/Projects/Cog/Libraries/WavPack/build";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -336,7 +338,7 @@
 				HEADER_SEARCH_PATHS = MAC;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				OTHER_CFLAGS = "-D__MACOSX__";
+				OTHER_CFLAGS = "-D__MACOSX__ -DHAVE_CONFIG_H";
 				OTHER_LDFLAGS = "-Wl,-read_only_relocs,warning";
 				PRODUCT_NAME = Cog;
 				WRAPPER_EXTENSION = app;
@ -424,6 +426,8 @@
 				8E652A02083D93EB00A7AF1B,
 				8E0EBF0F084BA776003A6E64,
 				8E14E47C084CF1A200246BCC,
+				8E8BAE5408548BD500E9F14D,
+				8E8BAE5808548BE800E9F14D,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@ -451,6 +455,8 @@
 				8E81BC34083673ED0025A375,
 				8E5A9032084CB48500AE6D62,
 				8E14E469084CF15C00246BCC,
+				8E8BAE9908548C5500E9F14D,
+				8E8BAE9D08548C6300E9F14D,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@ -1009,6 +1015,90 @@
 			settings = {
 			};
 		};
+		8E8BAE5108548BD500E9F14D = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = WavPackFile.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8E8BAE5208548BD500E9F14D = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = WavPackFile.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8E8BAE5408548BD500E9F14D = {
+			fileRef = 8E8BAE5208548BD500E9F14D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8E8BAE5508548BE800E9F14D = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = ShnFile.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8E8BAE5608548BE800E9F14D = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = ShnFile.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8E8BAE5808548BE800E9F14D = {
+			fileRef = 8E8BAE5608548BE800E9F14D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8E8BAE9808548C5500E9F14D = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
+			name = Shorten.framework;
+			path = Libraries/Shorten/build/Shorten.framework;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8E8BAE9908548C5500E9F14D = {
+			fileRef = 8E8BAE9808548C5500E9F14D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8E8BAE9C08548C6300E9F14D = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
+			name = WavPack.framework;
+			path = Libraries/WavPack/build/WavPack.framework;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8E8BAE9D08548C6300E9F14D = {
+			fileRef = 8E8BAE9C08548C6300E9F14D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8E8BAEA508548C8200E9F14D = {
+			fileRef = 8E8BAE9C08548C6300E9F14D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8E8BAEA608548C8200E9F14D = {
+			fileRef = 8E8BAE9808548C5500E9F14D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		8EAB85FC0846889B000A9CEC = {
 			isa = PBXFileReference;
 			lastKnownFileType = image.png;
@ -1475,6 +1565,10 @@
 				8EF6FA70082DA526006F7BE6,
 				8EF6FA71082DA526006F7BE6,
 				8EF6FA72082DA526006F7BE6,
+				8E8BAE5108548BD500E9F14D,
+				8E8BAE5208548BD500E9F14D,
+				8E8BAE5508548BE800E9F14D,
+				8E8BAE5608548BE800E9F14D,
 				8EF6FA6D082DA526006F7BE6,
 				8EF6FA6E082DA526006F7BE6,
 			);
@ -1556,9 +1650,9 @@
 			sourceTree = "<group>";
 		};
 		8EF6FA6E082DA526006F7BE6 = {
+			explicitFileType = sourcecode.c.objc;
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.objc;
 			path = SoundFile.m;
 			refType = 4;
 			sourceTree = "<group>";
@ -1642,6 +1736,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				8E8BAEA508548C8200E9F14D,
+				8E8BAEA608548C8200E9F14D,
 				8E14E472084CF16400246BCC,
 				8E5A908D084CB92D00AE6D62,
 				8EFFB6D0083302A500C53833,
--- a/Cog.xcode/xugg.mode1
+++ b/Cog.xcode/xugg.mode1
@ -254,14 +254,13 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>1C37FBAC04509CD000000102</string>
+								<string>080E96DDFE201D6D7F000001</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>7</integer>
-									<integer>6</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@ -314,7 +313,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8EA0943E0854080700EBC193</string>
+										<string>8EB30E240854C36A009EA87F</string>
 										<key>history</key>
 										<array>
 											<string>8EF6FACD082DAA2B006F7BE6</string>
@ -323,13 +322,11 @@
 											<string>8E267DDB0837FE5F004ACBC5</string>
 											<string>8E1A1826083806B700AEA302</string>
 											<string>8E6082C7083920310017AECF</string>
-											<string>8E25B5E5083CDD4A0064353E</string>
 											<string>8E652A33083E1A7900A7AF1B</string>
 											<string>8E652A34083E1A7900A7AF1B</string>
 											<string>8E652A35083E1A7900A7AF1B</string>
 											<string>8E652A36083E1A7900A7AF1B</string>
 											<string>8EDCBEF40840FA2200F5C7E3</string>
-											<string>8EC8FBD20842932A00DF2C98</string>
 											<string>8EDC88A90842F8DE007D1532</string>
 											<string>8EDC88B50842F936007D1532</string>
 											<string>8ED833CD08457E6B0033CDBD</string>
@ -338,14 +335,12 @@
 											<string>8E10DC02084BBE490013815C</string>
 											<string>8E94D9D2084BEA32007F0AEB</string>
 											<string>8E94D9D3084BEA32007F0AEB</string>
-											<string>8E5A8EA4084CB19900AE6D62</string>
 											<string>8E5A90B7084CC25900AE6D62</string>
 											<string>8E5A90B8084CC25900AE6D62</string>
 											<string>8EA0A215084CC43F008DFEC9</string>
 											<string>8EA0A216084CC43F008DFEC9</string>
 											<string>8EA0A21A084CC43F008DFEC9</string>
 											<string>8E14E4A5084D089100246BCC</string>
-											<string>8E74C916084D451C00DF47F3</string>
 											<string>8EC18D9F084E3D8200AE0BA9</string>
 											<string>8E9E2E81084FA7E400599965</string>
 											<string>8EC156F4084FEB8900BB24E8</string>
@ -356,25 +351,36 @@
 											<string>8EE2A5B908511A1800367489</string>
 											<string>8E72BC630851408F00E34F1D</string>
 											<string>8E72BC640851408F00E34F1D</string>
-											<string>8E72BC650851408F00E34F1D</string>
 											<string>8EFC6D18085376D100C67D06</string>
 											<string>8EFC6DE7085380B800C67D06</string>
 											<string>8EFC6DE8085380B800C67D06</string>
-											<string>8EFC6DEA085380B800C67D06</string>
-											<string>8EFC6DEB085380B800C67D06</string>
-											<string>8EFC6DEC085380B800C67D06</string>
-											<string>8EFC6DED085380B800C67D06</string>
-											<string>8EFC6DEE085380B800C67D06</string>
-											<string>8EFC6DEF085380B800C67D06</string>
 											<string>8EFC6DF0085380B800C67D06</string>
-											<string>8EFC6DF1085380B800C67D06</string>
-											<string>8EFC6DF2085380B800C67D06</string>
 											<string>8EFC6DF3085380B800C67D06</string>
-											<string>8EFC6DF4085380B800C67D06</string>
 											<string>8EFC6E29085386CE00C67D06</string>
-											<string>8EFC6E2A085386CE00C67D06</string>
-											<string>8EA094320853FC4600EBC193</string>
-											<string>8EA0942E0853FC4200EBC193</string>
+											<string>8E3EDBC9085477D0007C6A53</string>
+											<string>8E3EDBCF085477D0007C6A53</string>
+											<string>8E3EDBD1085477D0007C6A53</string>
+											<string>8E8BAF10085494E000E9F14D</string>
+											<string>8E8BAF780854976A00E9F14D</string>
+											<string>8E8BAF790854976A00E9F14D</string>
+											<string>8E8BAF7A0854976A00E9F14D</string>
+											<string>8E8BAF7C0854976A00E9F14D</string>
+											<string>8E91CCEE08549FEE0055EC68</string>
+											<string>8EB30D890854BEF1009EA87F</string>
+											<string>8EB30D8A0854BEF1009EA87F</string>
+											<string>8EB30DAC0854BFEE009EA87F</string>
+											<string>8EB30DAD0854BFEE009EA87F</string>
+											<string>8EB30DAE0854BFEE009EA87F</string>
+											<string>8EB30DDB0854C261009EA87F</string>
+											<string>8EB30DDC0854C261009EA87F</string>
+											<string>8EB30DDD0854C261009EA87F</string>
+											<string>8EB30DDE0854C261009EA87F</string>
+											<string>8EB30DDF0854C261009EA87F</string>
+											<string>8EB30DE00854C261009EA87F</string>
+											<string>8EB30E1E0854C36A009EA87F</string>
+											<string>8EB30E1F0854C36A009EA87F</string>
+											<string>8EB30E200854C36A009EA87F</string>
+											<string>8E8BAF7B0854976A00E9F14D</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@ -436,7 +442,51 @@
 											<string>8E14E4B5084D089100246BCC</string>
 											<string>8EC18EBD084E57D500AE0BA9</string>
 											<string>8EC156F9084FEB8900BB24E8</string>
-											<string>8EA094330853FC4600EBC193</string>
+											<string>8E3EDBE0085477D0007C6A53</string>
+											<string>8E3EDBE4085477D0007C6A53</string>
+											<string>8E8BAEB208548C9600E9F14D</string>
+											<string>8E8BAEB308548C9600E9F14D</string>
+											<string>8E8BAEB708548C9600E9F14D</string>
+											<string>8E8BAF17085494E000E9F14D</string>
+											<string>8EB30D8D0854BEF1009EA87F</string>
+											<string>8EB30D8E0854BEF1009EA87F</string>
+											<string>8EB30D8F0854BEF1009EA87F</string>
+											<string>8EB30D900854BEF1009EA87F</string>
+											<string>8EB30D910854BEF1009EA87F</string>
+											<string>8EB30D920854BEF1009EA87F</string>
+											<string>8EB30D930854BEF1009EA87F</string>
+											<string>8EB30D940854BEF1009EA87F</string>
+											<string>8EB30D950854BEF1009EA87F</string>
+											<string>8EB30D960854BEF1009EA87F</string>
+											<string>8EB30D970854BEF1009EA87F</string>
+											<string>8EB30D980854BEF1009EA87F</string>
+											<string>8EB30D990854BEF1009EA87F</string>
+											<string>8EB30D9A0854BEF1009EA87F</string>
+											<string>8EB30D9B0854BEF1009EA87F</string>
+											<string>8EB30D9C0854BEF1009EA87F</string>
+											<string>8EB30D9D0854BEF1009EA87F</string>
+											<string>8EB30DB00854BFEE009EA87F</string>
+											<string>8EB30DB10854BFEE009EA87F</string>
+											<string>8EB30DB20854BFEE009EA87F</string>
+											<string>8EB30DB30854BFEE009EA87F</string>
+											<string>8EB30DB40854BFEE009EA87F</string>
+											<string>8EB30DB50854BFEE009EA87F</string>
+											<string>8EB30DE20854C261009EA87F</string>
+											<string>8EB30DE30854C261009EA87F</string>
+											<string>8EB30DE40854C261009EA87F</string>
+											<string>8EB30DE50854C261009EA87F</string>
+											<string>8EB30DE60854C261009EA87F</string>
+											<string>8EB30DE70854C261009EA87F</string>
+											<string>8EB30DE80854C261009EA87F</string>
+											<string>8EB30DE90854C261009EA87F</string>
+											<string>8EB30DEA0854C261009EA87F</string>
+											<string>8EB30DEB0854C261009EA87F</string>
+											<string>8EB30DEC0854C261009EA87F</string>
+											<string>8EB30DED0854C261009EA87F</string>
+											<string>8EB30DEE0854C261009EA87F</string>
+											<string>8EB30E210854C36A009EA87F</string>
+											<string>8EB30E220854C36A009EA87F</string>
+											<string>8EB30E230854C36A009EA87F</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@ -494,9 +544,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8EA094280853F7B900EBC193</string>
+				<string>8EB30D9F0854BEF1009EA87F</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>8EA094290853F7B900EBC193</string>
+				<string>8EB30DA00854BEF1009EA87F</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@ -631,7 +681,7 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>1C0AD2B3069F1EA900FABCE6</string>
-		<string>1C530D57069F1CE1000CFCEE</string>
+		<string>8EF6FAA6082DA951006F7BE6</string>
 		<string>/Users/xugg/Projects/Cog/Cog.xcode</string>
 	</array>
 	<key>WindowString</key>
@ -651,12 +701,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>AACFile.m</string>
+								<string>ShnFile.m</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@ -673,12 +725,8 @@
 							<string>342pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
-								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-								<string>{{0, 82}, {1024, 154}}</string>
 								<key>PBXProjectModuleGUID</key>
 								<string>XCMainBuildResultsModuleGUID</string>
 								<key>PBXProjectModuleLabel</key>
@ -716,7 +764,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>8EF6FAA6082DA951006F7BE6</string>
-				<string>8EFC6CE5085372F200C67D06</string>
+				<string>8EB30D540854BDDD009EA87F</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@ -758,8 +806,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {245, 210}}</string>
-											<string>{{245, 0}, {779, 210}}</string>
+											<string>{{0, 0}, {225, 206}}</string>
+											<string>{{225, 0}, {799, 206}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@ -774,8 +822,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {1024, 210}}</string>
-											<string>{{0, 210}, {1024, 374}}</string>
+											<string>{{0, 0}, {1024, 206}}</string>
+											<string>{{0, 206}, {1024, 378}}</string>
 										</array>
 									</dict>
 								</dict>
@ -822,14 +870,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>8EC7DA61084E64C200A079A7</string>
+				<string>8E91CD450854A4BF0055EC68</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>8EC7DA62084E64C200A079A7</string>
-				<string>8EC7DA63084E64C200A079A7</string>
-				<string>8EC7DA64084E64C200A079A7</string>
-				<string>8EC7DA65084E64C200A079A7</string>
-				<string>8EC7DA66084E64C200A079A7</string>
-				<string>8EC7DA67084E64C200A079A7</string>
+				<string>8E91CD460854A4BF0055EC68</string>
+				<string>8E91CD470854A4BF0055EC68</string>
+				<string>8E91CD480854A4BF0055EC68</string>
+				<string>8E91CD490854A4BF0055EC68</string>
+				<string>8E91CD4A0854A4BF0055EC68</string>
+				<string>8E91CD4B0854A4BF0055EC68</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debug</string>
@ -983,7 +1031,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>8E7A9371083675B600771E14</string>
-				<string>8EC7DA68084E64C200A079A7</string>
+				<string>8E91CD4C0854A4BF0055EC68</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>WindowString</key>
@ -1078,9 +1126,9 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>8EA094380853FDEB00EBC193</string>
+				<string>8EB30D820854BEA3009EA87F</string>
 				<string>1CD0528B0623707200166675</string>
-				<string>8EA094390853FDEB00EBC193</string>
+				<string>8EB30D830854BEA3009EA87F</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>
--- a/Cog.xcode/xugg.pbxuser
+++ b/Cog.xcode/xugg.pbxuser
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@ -19,7 +19,7 @@
 	
 	if (self)
 	{
-		acceptableFileTypes = [[NSArray alloc] initWithObjects:@"ogg",@"wav",@"mpc",@"flac",@"ape",@"mp3",@"aiff",@"aif",@"aac",nil];
+		acceptableFileTypes = [[NSArray alloc] initWithObjects:@"shn",@"wv",@"ogg",@"wav",@"mpc",@"flac",@"ape",@"mp3",@"aiff",@"aif",@"aac",nil];
 		acceptablePlaylistTypes = [[NSArray alloc] initWithObjects:@"playlist",nil];
 		history = [[NSMutableArray alloc] init];
 		shuffleList = [[NSMutableArray alloc] init];
--- a/7
+++ b/7
@ -1,10 +1,11 @@
    Cog is released under the GPL. See COPYING for details.
-    The libraries folder . It contains various decoding and tagging
-frameworks, which i have created Xcode projects for, and possibly modified
+    The libraries folder contains various decoding and tagging
+libraries, which i have created Xcode projects for, and possibly modified
 to make compile on OS X. The various libraries are under each of their own
 licenses.
    Please note that the source code may contain vulgar language as comments,
-and in debugging messages. All Cog code is copywrited by me.
+and in debugging messages. All Cog code is copywrited by me, and is licensed
+under the GPL.
    If you would like the photoshop sources for the various icons and
 graphics, please send me an email, and I will be happy to get them to you.

--- a/Sound.m
+++ b/Sound.m
@ -313,8 +313,9 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 		pos = [self calculatePos:time];
 		
 		newTime = [soundFile seekToTime:time];
-		if (newTime >= 0)
+		if (newTime >= 0.0)
 		{
+			DBLog(@"RESETTING");
 			[self resetBuffer];
 			
 			pos = [self calculatePos:newTime];
@ -325,6 +326,7 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 		}
 		else
 		{
+			DBLog(@"Not resetting: %f", newTime);
 			newTime = [self calculateTime:currentPosition];
 		}
 		//send a message with newTime
--- a/SoundFile/MPEGFile.m
+++ b/SoundFile/MPEGFile.m
@ -102,7 +102,7 @@
 - (double)seekToTime:(double)milliseconds
 {
 	DecMPA_SeekToTime(decoder, (unsigned long)milliseconds);
-	
+
 	return milliseconds;
 }

--- a/SoundFile/ShnFile.h
+++ b/SoundFile/ShnFile.h
@ -0,0 +1,24 @@
+//
+//  ShnFile.h
+//  Cog
+//
+//  Created by Zaphod Beeblebrox on 6/6/05.
+//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "SoundFile.h"
+
+#import "Shorten/shorten.h"
+#import "Shorten/shn.h"
+#import "Shorten/decode.h"
+
+@interface ShnFile : SoundFile {
+	shn_file *handle;
+	
+	int bufferSize; //total size
+	void *buffer;
+	int bufferAmount; //amount currently in
+}
+
+@end
--- a/SoundFile/ShnFile.m
+++ b/SoundFile/ShnFile.m
@ -0,0 +1,113 @@
+//
+//  ShnFile.m
+//  Cog
+//
+//  Created by Zaphod Beeblebrox on 6/6/05.
+//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//
+
+#import "ShnFile.h"
+
+
+@implementation ShnFile
+
+- (BOOL)open:(const char *)filename
+{
+	BOOL r;
+	
+	r = [self readInfo:filename];
+	if (!r)
+		return NO;
+	
+	bufferSize = shn_get_buffer_block_size(handle, 512);
+	buffer = malloc(bufferSize);
+	
+	return YES;
+}
+
+- (BOOL)readInfo:(const char *)filename
+{
+	shn_config conf;
+	int r;
+	
+	conf.error_output_method =  ERROR_OUTPUT_DEVNULL;
+	conf.seek_tables_path = NULL;
+	conf.relative_seek_tables_path = ".";
+	conf.verbose = 0;
+	conf.swap_bytes = 0;
+	
+	handle = shn_load((char *)filename, conf);
+	if (!handle)
+		return NO;
+	
+	r = shn_init_decoder(handle);
+	if (r < 0)
+		return NO;
+	
+	channels = shn_get_channels(handle);
+	frequency = shn_get_samplerate(handle);
+	bitsPerSample = shn_get_bitspersample(handle);
+	
+	unsigned int length;
+	length = shn_get_song_length(handle);
+	totalSize = ((double)(length*frequency)/1000.0) * channels * (bitsPerSample/8);
+	
+	bitRate = (int)((double)totalSize/((double)length/1000.0));
+
+	return YES;
+}
+
+- (int)fillBuffer:(void *)buf ofSize:(UInt32)size
+{
+	int numread = bufferAmount;
+	int count = 0;
+	
+	//Fill from buffer, going by bufferAmount
+	//if still needs more, decode and repeat
+	if (bufferAmount == 0)
+	{
+		bufferAmount = shn_read(handle, buffer, bufferSize);
+	}
+	
+	count = bufferAmount;
+	if (bufferAmount > size)
+	{
+		count = size;
+	}
+	
+	memcpy(buf, buffer, count);
+	
+	bufferAmount -= count;
+	
+	if (bufferAmount > 0)
+		memmove(buffer, &buffer[count], bufferAmount);
+	
+	if (count < size)
+		numread = [self fillBuffer:(&((char *)buf)[count]) ofSize:(size - count)];
+	else
+		numread = 0;
+	
+	return count + numread;
+}
+
+- (double)seekToTime:(double)milliseconds
+{
+	unsigned int sec;
+	
+	if (!shn_seekable(handle))
+		return -1.0;
+	
+	sec = (int)(milliseconds/1000.0);
+	
+	shn_seek(handle, sec);
+	
+	return (sec * 1000.0);
+}
+
+- (void)close
+{
+	if (shn_cleanup_decoder(handle))
+		shn_unload(handle);
+}
+
+@end
--- a/SoundFile/SoundFile.m
+++ b/SoundFile/SoundFile.m
@ -36,7 +36,7 @@
 }

 //this should be done by the soundfile....not seek...
- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 }

@ -49,6 +49,8 @@
@class VorbisFile;
@class WaveFile;
@class AACFile;
+@class WavPackFile;
+@class ShnFile;

 + (SoundFile *)soundFileFromFilename:(NSString *)filename
 {
@ -82,6 +84,14 @@
 	{
 		soundFile = [[AACFile alloc] init];
 	}
+	else if ([[filename pathExtension] isEqualToString:@"wv"])
+	{
+		soundFile = [[WavPackFile alloc] init];
+	}
+	else if ([[filename pathExtension] isEqualToString:@"shn"])
+	{
+		soundFile = [[ShnFile alloc] init];
+	}
 	else
 	{
 		soundFile = nil;
@ -143,6 +153,8 @@
 	if (isBigEndian == YES)
 	{
 		sourceStreamFormat->mFormatFlags |= kLinearPCMFormatFlagIsBigEndian;
+		sourceStreamFormat->mFormatFlags |= kLinearPCMFormatFlagIsAlignedHigh;
+//		sourceStreamFormat->mFormatFlags |= kLinearPCMFormatFlagIsNonMixable;
 //		NSLog(@"FUCKER IS BIG ENDIAN");
 	}
 	if (isUnsigned == NO)
--- a/SoundFile/VorbisFile.m
+++ b/SoundFile/VorbisFile.m
@ -68,7 +68,7 @@
 	ov_clear(&vorbisRef);
 }

- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 	ov_time_seek(&vorbisRef, (double)milliseconds/1000.0);
 	
--- a/SoundFile/WavPackFile.h
+++ b/SoundFile/WavPackFile.h
@ -0,0 +1,18 @@
+//
+//  WavPackFile.h
+//  Cog
+//
+//  Created by Zaphod Beeblebrox on 6/6/05.
+//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "SoundFile.h"
+
+#import "Wavpack/wputils.h"
+
+@interface WavPackFile : SoundFile {
+	WavpackContext *wpc;
+}
+
+@end
--- a/SoundFile/WavPackFile.m
+++ b/SoundFile/WavPackFile.m
@ -0,0 +1,79 @@
+//
+//  WavPackFile.m
+//  Cog
+//
+//  Created by Zaphod Beeblebrox on 6/6/05.
+//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//
+
+#import "WavPackFile.h"
+
+
+@implementation WavPackFile
+
+- (UInt32)frequency
+{
+	//HACK ALERT
+	return frequency/2;
+}
+
+- (BOOL)open:(const char *)filename
+{
+	int open_flags = 0;
+	char error[80];
+
+	wpc = WavpackOpenFileInput(filename, error, open_flags, 0);
+	if (!wpc)
+		return NO;
+	
+	channels = WavpackGetNumChannels(wpc);
+	bitsPerSample = WavpackGetBitsPerSample(wpc);
+	frequency = WavpackGetSampleRate(wpc)*2;
+
+	int samples;
+	samples = WavpackGetNumSamples(wpc);
+	totalSize = samples * channels * 4;
+	
+	bitRate = (int)(WavpackGetAverageBitrate(wpc, TRUE)/1000.0);
+
+	isBigEndian = YES;
+
+	return YES;
+}
+
+- (BOOL)readInfo:(const char *)filename
+{
+	return [self open:filename]; //does the same damn thing
+}
+
+- (int)fillBuffer:(void *)buf ofSize:(UInt32)size
+{
+	int numsamples;
+	int n;
+	
+	numsamples = size/4/channels;
+//	DBLog(@"NUM SAMPLES: %i %i", numsamples, size);
+	n = WavpackUnpackSamples(wpc, buf, numsamples);
+	
+	n *= 4*channels;
+//	DBLog(@"Read: %i", n);
+
+	return n;
+}
+
+- (double)seekToTime:(double)milliseconds
+{
+	int sample;
+	sample = (frequency/2)*(milliseconds/1000.0);
+	DBLog(@"%lf %i", milliseconds, sample);
+	WavpackSeekSample(wpc, sample);
+	
+	return milliseconds;
+}
+
+- (void)close
+{
+	WavpackCloseFile(wpc);
+}
+
+@end