microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 11:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing encode functions

Browse Source
This commit is contained in:
Matthias Neeracher 2007-08-12 20:45:25 +00:00
parent c7d2cf1107
commit 9ff65437d7
2 changed files with 83 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Sources/VLPListDocument.mm
View File

@ -9,6 +9,7 @@
//
#import "VLPListDocument.h"
#import "VLModel.h"
//
// To convert from and to complex file formats, we use ruby scripts operating
@ -21,7 +22,7 @@
class VLPlistVisitor : public VLSongVisitor {
public:
VLPListVisitor(NSDictionary * plist, bool performanceOrder)
VLPlistVisitor(NSMutableDictionary * plist, bool performanceOrder)
: fPlist(plist), fPerfOrder(performanceOrder) {}
virtual void Visit(VLSong & song);
@ -30,14 +31,67 @@ protected:
virtual void VisitNote(VLLyricsNote & n);
virtual void VisitChord(VLChord & c);
NSDictionary * fPlist;
NSMutableArray *fMeasures;
NSMutableArray *fNotes;
NSMutableArray *fChords;
NSArray * EncodeProperties(const std::vector<VLProperties> & properties);
NSDictionary * EncodeProperties(const VLProperties & properties);
NSArray * EncodeRepeats(const std::vector<VLRepeat> & repeats);
NSDictionary * EncodeRepeat(const VLRepeat & repeat);
NSMutableDictionary * fPlist;
NSMutableArray * fMeasures;
NSMutableArray * fNotes;
NSMutableArray * fChords;
bool fPerfOrder;
const VLSong * fSong;
};
NSArray * VLPlistVisitor::EncodeProperties(const std::vector<VLProperties> & properties)
{
NSMutableArray * pa = [NSMutableArray arrayWithCapacity:properties.size()];
for (std::vector<VLProperties>::const_iterator i = properties.begin();
i != properties.end(); ++i)
[pa addObject:EncodeProperties(*i)];
return pa;
}
NSDictionary * VLPlistVisitor::EncodeProperties(const VLProperties & properties)
{
return [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt: properties.fTime.fNum], @"timeNum",
[NSNumber numberWithInt: properties.fTime.fDenom], @"timeDenom",
[NSNumber numberWithInt: properties.fKey], @"key",
[NSNumber numberWithInt: properties.fMode], @"mode",
[NSNumber numberWithInt: properties.fDivisions], @"divisions"];
}
NSArray * VLPlistVisitor::EncodeRepeats(const std::vector<VLRepeat> & repeats)
{
NSMutableArray * ra = [NSMutableArray arrayWithCapacity:repeats.size()];
for (std::vector<VLRepeat>::const_iterator i = repeats.begin();
i != repeats.end(); ++i)
[ra addObject:EncodeRepeat(*i)];
return ra;
}
NSDictionary * VLPlistVisitor::EncodeRepeat(const VLRepeat & repeat)
{
NSMutableArray * ea = [NSMutableArray arrayWithCapacity:repeat.fEndings.size()];
for (std::vector<VLRepeat::Ending>::const_iterator i = repeat.fEndings.begin();
i != repeat.fEndings.end(); ++i)
[ea addObject:[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt: i->fBegin], @"begin",
[NSNumber numberWithInt: i->fEnd], @"end",
[NSNumber numberWithInt: i->fVolta], @"volta"]];
return [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt: repeat.fTimes], @"times",
ea, @"endings"];
}
void VLPlistVisitor::Visit(VLSong & song)
{
fSong = &song;
@ -58,7 +112,7 @@ void VLPlistVisitor::VisitMeasure(size_t m, VLProperties & p, VLMeasure & meas)
VisitChords(meas);
NSDictionary * md =
[NSDictionary dictionaryWithValuesAndKeys:
[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:m], @"measure",
[NSNumber numberWithInt:meas.fPropIdx], @"properties",
fNotes, @"melody",
@ -69,7 +123,7 @@ void VLPlistVisitor::VisitMeasure(size_t m, VLProperties & p, VLMeasure & meas)
void VLPlistVisitor::VisitNote(VLLyricsNote & n)
{
NSDictionary * nd =
[NSDictionary dictionaryWithValuesAndKeys:
[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:n.fDuration.fNum], @"durNum",
[NSNumber numberWithInt:n.fDuration.fDenom], @"durDenom",
[NSNumber numberWithInt:n.fPitch], @"pitch",
@ -81,12 +135,12 @@ void VLPlistVisitor::VisitNote(VLLyricsNote & n)
void VLPlistVisitor::VisitChord(VLChord & c)
{
NSDictionary * cd =
[NSDictionary dictionaryWithValuesAndKeys:
[NSNumber numberWithInt:n.fDuration.fNum], @"durNum",
[NSNumber numberWithInt:n.fDuration.fDenom], @"durDenom",
[NSNumber numberWithInt:n.fPitch], @"pitch",
[NSNumber numberWithInt:n.fSteps], @"steps",
[NSNumber numberWithInt:n.fRootPitch], @"root"];
[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:c.fDuration.fNum], @"durNum",
[NSNumber numberWithInt:c.fDuration.fDenom], @"durDenom",
[NSNumber numberWithInt:c.fPitch], @"pitch",
[NSNumber numberWithInt:c.fSteps], @"steps",
[NSNumber numberWithInt:c.fRootPitch], @"root"];
[fChords addObject: cd];
}
@ -115,10 +169,12 @@ void VLPlistVisitor::VisitChord(VLChord & c)
- (BOOL)readFromPlist:(id)plist error:(NSError **)outError
{
return NO;
}
(NSData *)runFilter:(NSString *)filterName withContents:(NSData *)contents
- (NSData *)runFilter:(NSString *)filterName withContents:(NSData *)contents
{
return nil;
}
- (NSFileWrapper *)fileWrapperWithFilter:(NSString *)filterName
@ -126,7 +182,7 @@ void VLPlistVisitor::VisitChord(VLChord & c)
{
NSBundle * mainBundle = [NSBundle mainBundle];
BOOL perfOrder = [mainBundle pathForResource:filterName
ofType:@"pwriter" inDirectory:@"Filters"];
ofType:@"pwriter" inDirectory:@"Filters"] != nil;
filterName = [filterName stringByAppendingPathExtension:
perfOrder ? @"pwriter" : @"writer"];
NSData * inData = [self plistInPerformanceOrder:perfOrder];
@ -140,6 +196,7 @@ void VLPlistVisitor::VisitChord(VLChord & c)
withFilter:(NSString *)filterName
error:(NSError **)outError
{
return NO;
}
@end

12
VocalEasel.xcodeproj/project.pbxproj
View File

@ -47,6 +47,7 @@
955E59610957C1400045FDA5 /* TVLChord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 955E59600957C1400045FDA5 /* TVLChord.cpp */; };
955E59640957C15A0045FDA5 /* VLModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 955E58E4095658AB0045FDA5 /* VLModel.cpp */; };
95784D870BFAD795009ABEA4 /* VLMirrorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95784D860BFAD795009ABEA4 /* VLMirrorWindow.mm */; };
9588363C0C6F9C7D004B4162 /* VLPListDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9588363B0C6F9C7D004B4162 /* VLPListDocument.mm */; };
95932B91096527700008B0DB /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 952CBBB3095FD34F00434E43 /* AudioUnit.framework */; };
95932B92096527710008B0DB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 952CBBB2095FD34F00434E43 /* AudioToolbox.framework */; };
9593E4E80AE0ED1F00035816 /* vlsong.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9593E4E60AE0ED1F00035816 /* vlsong.icns */; };
@ -190,6 +191,8 @@
955E59600957C1400045FDA5 /* TVLChord.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TVLChord.cpp; path = Tests/TVLChord.cpp; sourceTree = "<group>"; };
95784D850BFAD795009ABEA4 /* VLMirrorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLMirrorWindow.h; path = Sources/VLMirrorWindow.h; sourceTree = "<group>"; };
95784D860BFAD795009ABEA4 /* VLMirrorWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLMirrorWindow.mm; path = Sources/VLMirrorWindow.mm; sourceTree = "<group>"; };
9588363A0C6F9C7D004B4162 /* VLPListDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLPListDocument.h; path = Sources/VLPListDocument.h; sourceTree = "<group>"; };
9588363B0C6F9C7D004B4162 /* VLPListDocument.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLPListDocument.mm; path = Sources/VLPListDocument.mm; sourceTree = "<group>"; };
9593E4E60AE0ED1F00035816 /* vlsong.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = vlsong.icns; path = Resources/vlsong.icns; sourceTree = "<group>"; };
9593E4E70AE0ED1F00035816 /* vlapp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = vlapp.icns; path = Resources/vlapp.icns; sourceTree = "<group>"; };
959408A0096922CA007CCCF8 /* TVLEdit */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TVLEdit; sourceTree = BUILT_PRODUCTS_DIR; };
@ -345,6 +348,8 @@
2A37F4ABFDCFA73011CA2CEA /* Classes */ = {
isa = PBXGroup;
children = (
9588363A0C6F9C7D004B4162 /* VLPListDocument.h */,
9588363B0C6F9C7D004B4162 /* VLPListDocument.mm */,
9545C5C10C092F4600251547 /* VLMMAWriter.cpp */,
9545C5C20C092F4600251547 /* VLMMAWriter.h */,
955DA2940C0551EC008F73B8 /* VLLilypondWriter.cpp */,
@ -693,6 +698,7 @@
95784D870BFAD795009ABEA4 /* VLMirrorWindow.mm in Sources */,
955DA2960C0551EC008F73B8 /* VLLilypondWriter.cpp in Sources */,
9545C5C30C092F4600251547 /* VLMMAWriter.cpp in Sources */,
9588363C0C6F9C7D004B4162 /* VLPListDocument.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -773,7 +779,7 @@
95D7BF750AA699C600D5E02C /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
USER_HEADER_SEARCH_PATHS = "Sources/**";
};
name = Development;
@ -781,14 +787,14 @@
95D7BF760AA699C600D5E02C /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
95D7BF770AA699C600D5E02C /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};