backup/XNI
1
0
Fork 0
mirror of https://github.com/thes3m/XNI synced 2024-12-26 13:26:06 +01:00
Code Issues Projects Releases Activity

Song support added.

Browse Source 
git-svn-id: http://xni.googlecode.com/svn/XNI@53 ac433895-eea3-a490-d80a-17149a75e588
This commit is contained in:
Matej Jan 2011-01-18 15:00:30 +00:00
parent 7cd74d182f
commit 2adbc50363
9 changed files with 130 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/Retronator/Xni/Framework/Content/ContentManager.m
View File

@ -132,7 +132,7 @@
} else if ([extension isEqualToString:@"mp3"]) {
// Mp3 audio content
if (!importer) {
importer = [[[WavImporter alloc] init] autorelease];
importer = [[[Mp3Importer alloc] init] autorelease];
}
if (!processor) {
processor = [[[SongProcessor alloc] init] autorelease];

1
Classes/Retronator/Xni/Framework/Content/ContentTypeReaderManager.h
View File

@ -21,6 +21,7 @@
ModelBoneReader *modelBoneReader;
VertexDeclarationReader *vertexDeclarationReader;
SoundEffectReader *soundEffectReader;
SongReader *songReader;
SpriteFontReader *spriteFontReader;
}

4
Classes/Retronator/Xni/Framework/Content/ContentTypeReaderManager.m
View File

@ -28,6 +28,7 @@
modelBoneReader = [[ModelBoneReader alloc] init];
vertexDeclarationReader = [[VertexDeclarationReader alloc] init];
soundEffectReader = [[SoundEffectReader alloc] init];
songReader = [[SongReader alloc] init];
spriteFontReader = [[SpriteFontReader alloc] init];
}
return self;
@ -55,6 +56,8 @@
return vertexDeclarationReader;
} else if (targetType == [SoundEffectContent class]) {
return soundEffectReader;
} else if (targetType == [SongContent class]) {
return songReader;
} else if (targetType == [SpriteFontContent class]) {
return spriteFontReader;
} else {
@ -74,6 +77,7 @@
[modelBoneReader release];
[vertexDeclarationReader release];
[soundEffectReader release];
[songReader release];
[spriteFontReader release];
[super dealloc];
}

9
Classes/Retronator/Xni/Framework/Content/Pipeline/Mp3Importer.m
View File

@ -8,7 +8,16 @@
#import "Mp3Importer.h"
#import "Retronator.Xni.Framework.Content.Pipeline.Audio.h"
@implementation Mp3Importer
- (id) importFile:(NSString *)filename {
AudioContent *content = [[[AudioContent alloc] initWithAudioFileName:filename audioFileType:AudioFileTypeMp3] autorelease];
if (content.format.channelCount > 2) {
[NSException raise:@"NotSupportedException" format:@"Only mono and stereo sounds are supported. Got %i channels.", content.format.channelCount];
}
return content;
}
@end

2
Classes/Retronator/Xni/Framework/Content/Retronator.Xni.Framework.Content.classes.h
View File

@ -4,5 +4,5 @@
@class ModelReader, ModelMeshReader, ModelMeshPartReader;
@class BasicEffectReader, IndexBufferReader, VertexBufferReader;
@class ModelBoneReader, VertexDeclarationReader;
@class SoundEffectReader;
@class SoundEffectReader, SongReader;
@class SpriteFontReader;

1
Classes/Retronator/Xni/Framework/Content/Retronator.Xni.Framework.Content.h
View File

@ -17,5 +17,6 @@
#import "VertexDeclarationReader.h"
#import "SoundEffectReader.h"
#import "SongReader.h"
#import "SpriteFontReader.h"

17
Classes/Retronator/Xni/Framework/Content/SongReader.h Normal file
View File

@ -0,0 +1,17 @@
//
// SongReader.h
// XNI
//
// Created by Matej Jan on 18.1.11.
// Copyright 2011 Retronator. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "ContentTypeReader.h"
@interface SongReader : ContentTypeReader {
}
@end

30
Classes/Retronator/Xni/Framework/Content/SongReader.m Normal file
View File

@ -0,0 +1,30 @@
//
// SongReader.m
// XNI
//
// Created by Matej Jan on 18.1.11.
// Copyright 2011 Retronator. All rights reserved.
//
#import "SongReader.h"
#import "Retronator.Xni.Framework.Content.h"
#import "Retronator.Xni.Framework.Media.h"
#import "Retronator.Xni.Framework.Content.Pipeline.Processors.h"
#import "Retronator.Xni.Framework.Content.Pipeline.Audio.h"
#import "SongContent+Internal.h"
#import "Song+Internal.h"
@implementation SongReader
- (id) readFromInput:(ContentReader *)input into:(id)existingInstance {
SongContent *content = input.content;
Song *song = [[[Song alloc] initWithUrl:content.url] autorelease];
return song;
}
@end

68
XNI.xcodeproj/project.pbxproj
View File

@ -12,6 +12,20 @@
B50769151264EE9500E4474F /* GameComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = B50769131264EE9500E4474F /* GameComponent.m */; };
B507691C1264EF0B00E4474F /* DrawableGameComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = B507691A1264EF0B00E4474F /* DrawableGameComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507691D1264EF0B00E4474F /* DrawableGameComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = B507691B1264EF0B00E4474F /* DrawableGameComponent.m */; };
B507F84012E5751700A7302B /* MediaPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F83E12E5751700A7302B /* MediaPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507F84112E5751700A7302B /* MediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B507F83F12E5751700A7302B /* MediaPlayer.m */; };
B507F84312E5752C00A7302B /* Retronator.Xni.Framework.Media.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F84212E5752C00A7302B /* Retronator.Xni.Framework.Media.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507F84512E5753500A7302B /* Retronator.Xni.Framework.Media.classes.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F84412E5753500A7302B /* Retronator.Xni.Framework.Media.classes.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507F85112E5756400A7302B /* Song.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F84F12E5756400A7302B /* Song.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507F85212E5756400A7302B /* Song.m in Sources */ = {isa = PBXBuildFile; fileRef = B507F85012E5756400A7302B /* Song.m */; };
B507F85E12E5766C00A7302B /* Song+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F85D12E5766C00A7302B /* Song+Internal.h */; };
B507F86012E5888C00A7302B /* SongContent+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F85F12E5888C00A7302B /* SongContent+Internal.h */; };
B507F87512E58AC300A7302B /* SongReader.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F87312E58AC300A7302B /* SongReader.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507F87612E58AC300A7302B /* SongReader.m in Sources */ = {isa = PBXBuildFile; fileRef = B507F87412E58AC300A7302B /* SongReader.m */; };
B507F8BC12E58E7000A7302B /* MediaQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F8BA12E58E7000A7302B /* MediaQueue.h */; settings = {ATTRIBUTES = (Public, ); }; };
B507F8BD12E58E7000A7302B /* MediaQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = B507F8BB12E58E7000A7302B /* MediaQueue.m */; };
B507F8C512E58EB100A7302B /* MediaQueue+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F8C412E58EB100A7302B /* MediaQueue+Internal.h */; };
B507F8DC12E5925500A7302B /* MediaEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = B507F8DB12E5925500A7302B /* MediaEnums.h */; settings = {ATTRIBUTES = (Public, ); }; };
B50806FF122E4ECF00C330E2 /* Texture.h in Headers */ = {isa = PBXBuildFile; fileRef = B50806FD122E4ECF00C330E2 /* Texture.h */; settings = {ATTRIBUTES = (Public, ); }; };
B5080700122E4ECF00C330E2 /* Texture.m in Sources */ = {isa = PBXBuildFile; fileRef = B50806FE122E4ECF00C330E2 /* Texture.m */; };
B5080703122E4EE900C330E2 /* Texture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = B5080701122E4EE900C330E2 /* Texture2D.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -395,6 +409,20 @@
B50769131264EE9500E4474F /* GameComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameComponent.m; sourceTree = "<group>"; };
B507691A1264EF0B00E4474F /* DrawableGameComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawableGameComponent.h; sourceTree = "<group>"; };
B507691B1264EF0B00E4474F /* DrawableGameComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DrawableGameComponent.m; sourceTree = "<group>"; };
B507F83E12E5751700A7302B /* MediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayer.h; sourceTree = "<group>"; };
B507F83F12E5751700A7302B /* MediaPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaPlayer.m; sourceTree = "<group>"; };
B507F84212E5752C00A7302B /* Retronator.Xni.Framework.Media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Retronator.Xni.Framework.Media.h; sourceTree = "<group>"; };
B507F84412E5753500A7302B /* Retronator.Xni.Framework.Media.classes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Retronator.Xni.Framework.Media.classes.h; sourceTree = "<group>"; };
B507F84F12E5756400A7302B /* Song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Song.h; sourceTree = "<group>"; };
B507F85012E5756400A7302B /* Song.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Song.m; sourceTree = "<group>"; };
B507F85D12E5766C00A7302B /* Song+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Song+Internal.h"; sourceTree = "<group>"; };
B507F85F12E5888C00A7302B /* SongContent+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SongContent+Internal.h"; sourceTree = "<group>"; };
B507F87312E58AC300A7302B /* SongReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongReader.h; sourceTree = "<group>"; };
B507F87412E58AC300A7302B /* SongReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongReader.m; sourceTree = "<group>"; };
B507F8BA12E58E7000A7302B /* MediaQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaQueue.h; sourceTree = "<group>"; };
B507F8BB12E58E7000A7302B /* MediaQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MediaQueue.m; sourceTree = "<group>"; };
B507F8C412E58EB100A7302B /* MediaQueue+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MediaQueue+Internal.h"; sourceTree = "<group>"; };
B507F8DB12E5925500A7302B /* MediaEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaEnums.h; sourceTree = "<group>"; };
B50806FD122E4ECF00C330E2 /* Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Texture.h; sourceTree = "<group>"; };
B50806FE122E4ECF00C330E2 /* Texture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Texture.m; sourceTree = "<group>"; };
B5080701122E4EE900C330E2 /* Texture2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Texture2D.h; sourceTree = "<group>"; };
@ -830,6 +858,24 @@
name = "Other Sources";
sourceTree = "<group>";
};
B507F83D12E574E400A7302B /* Media */ = {
isa = PBXGroup;
children = (
B507F84412E5753500A7302B /* Retronator.Xni.Framework.Media.classes.h */,
B507F84212E5752C00A7302B /* Retronator.Xni.Framework.Media.h */,
B507F8DB12E5925500A7302B /* MediaEnums.h */,
B507F84F12E5756400A7302B /* Song.h */,
B507F85D12E5766C00A7302B /* Song+Internal.h */,
B507F85012E5756400A7302B /* Song.m */,
B507F83E12E5751700A7302B /* MediaPlayer.h */,
B507F83F12E5751700A7302B /* MediaPlayer.m */,
B507F8BA12E58E7000A7302B /* MediaQueue.h */,
B507F8C412E58EB100A7302B /* MediaQueue+Internal.h */,
B507F8BB12E58E7000A7302B /* MediaQueue.m */,
);
path = Media;
sourceTree = "<group>";
};
B51ADC4A12B83549004E2DB0 /* Audio */ = {
isa = PBXGroup;
children = (
@ -1012,6 +1058,8 @@
B554FA0C12A4362B00F20A0D /* VertexDeclarationReader.m */,
B50FE48612B885BC003D4F1A /* SoundEffectReader.h */,
B50FE48712B885BC003D4F1A /* SoundEffectReader.m */,
B507F87312E58AC300A7302B /* SongReader.h */,
B507F87412E58AC300A7302B /* SongReader.m */,
B5ED4CED12BF8D9100A58E29 /* SpriteFontReader.h */,
B5ED4CEE12BF8D9100A58E29 /* SpriteFontReader.m */,
);
@ -1151,10 +1199,11 @@
isa = PBXGroup;
children = (
B51ADC4A12B83549004E2DB0 /* Audio */,
B52B2B4612ADAEB600E8A377 /* GamerServices */,
B5EC59F41252B8B6001E7DFC /* Input */,
B5A1C82B12353EFB00DB60CB /* Content */,
B52B2B4612ADAEB600E8A377 /* GamerServices */,
B5DDE82911FF10D0000DB38B /* Graphics */,
B5EC59F41252B8B6001E7DFC /* Input */,
B507F83D12E574E400A7302B /* Media */,
B5DE189F11F8888B00BF3275 /* Retronator.Xni.Framework.classes.h */,
B5DE18A011F8888B00BF3275 /* Retronator.Xni.Framework.h */,
B52BADAC1255426600B308F6 /* FrameworkEnums.h */,
@ -1280,6 +1329,7 @@
B50FE47B12B88433003D4F1A /* SoundEffectContent+Internal.h */,
B51ADC8212B83F62004E2DB0 /* SoundEffectContent.m */,
B51ADC7912B83EE9004E2DB0 /* SongContent.h */,
B507F85F12E5888C00A7302B /* SongContent+Internal.h */,
B51ADC7A12B83EE9004E2DB0 /* SongContent.m */,
B5ED4CC712BF898900A58E29 /* SpriteFontContent.h */,
B5ED4CCF12BF8A1600A58E29 /* SpriteFontContent+Internal.h */,
@ -1552,6 +1602,16 @@
B5ED4CD012BF8A1600A58E29 /* SpriteFontContent+Internal.h in Headers */,
B5ED4CEF12BF8D9100A58E29 /* SpriteFontReader.h in Headers */,
B5ED4D2512BF92A100A58E29 /* SpriteFont+Internal.h in Headers */,
B507F84012E5751700A7302B /* MediaPlayer.h in Headers */,
B507F84312E5752C00A7302B /* Retronator.Xni.Framework.Media.h in Headers */,
B507F84512E5753500A7302B /* Retronator.Xni.Framework.Media.classes.h in Headers */,
B507F85112E5756400A7302B /* Song.h in Headers */,
B507F85E12E5766C00A7302B /* Song+Internal.h in Headers */,
B507F86012E5888C00A7302B /* SongContent+Internal.h in Headers */,
B507F87512E58AC300A7302B /* SongReader.h in Headers */,
B507F8BC12E58E7000A7302B /* MediaQueue.h in Headers */,
B507F8C512E58EB100A7302B /* MediaQueue+Internal.h in Headers */,
B507F8DC12E5925500A7302B /* MediaEnums.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1798,6 +1858,10 @@
B5ED4CC112BF895B00A58E29 /* FontTextureProcessor.m in Sources */,
B5ED4CCA12BF898900A58E29 /* SpriteFontContent.m in Sources */,
B5ED4CF012BF8D9100A58E29 /* SpriteFontReader.m in Sources */,
B507F84112E5751700A7302B /* MediaPlayer.m in Sources */,
B507F85212E5756400A7302B /* Song.m in Sources */,
B507F87612E58AC300A7302B /* SongReader.m in Sources */,
B507F8BD12E58E7000A7302B /* MediaQueue.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};