Refinements every little where

CfxrDocument.h

@@ -11,6 +11,7 @@
 @class Sound;
 @interface CfxrDocument : NSPersistentDocument {
 	IBOutlet NSArrayController *soundsController;
+	IBOutlet NSTableView *soundsTable;
 }
 
 -(IBAction)generateSound:(id)sender;

CfxrDocument.m

@@ -21,12 +21,18 @@ - (NSString *)windowNibName
 - (void)windowControllerDidLoadNib:(NSWindowController *)windowController 
 {
     [super windowControllerDidLoadNib:windowController];
-    
-	if([[soundsController arrangedObjects] count] == 0)
+	
+	if([Sound countInContext:[self managedObjectContext]] == 0)
 		[self generateSoundFromCategory:@"Empty"];
 
-	[Playback playback]; // Nudge Playback class to have it initialize
+	// Sort by inverse index by default
+	NSSortDescriptor* sortDescriptor = [[NSSortDescriptor alloc]
+										initWithKey: @"index" ascending: NO
+										selector:@selector(compare:)];
+	[soundsController setSortDescriptors:[NSArray arrayWithObject:sortDescriptor]];
+	[sortDescriptor release];
 
+	soundsTable.delegate = self;
 }
 
 -(IBAction)generateSound:(id)sender;
@@ -40,11 +46,11 @@ -(Sound*)generateSoundFromCategory:(NSString*)category;
 												 inManagedObjectContext:[self managedObjectContext]];
 	[sound generateParamsFromCategory:category];
 
-	const int n = [[soundsController arrangedObjects] count] + 1;
-	sound.name = [NSString stringWithFormat:@"%03d %@", n, category];
+	sound.name = category;
 
 	[soundsController setSelectedObjects:[NSArray arrayWithObject:sound]];
 	[[Playback playback] play:sound];
+	[soundsController rearrangeObjects];
 	return sound;
 }
 
@@ -55,5 +61,10 @@ -(IBAction)play:(id)sender;
 
 }
 
+- (void)tableViewSelectionDidChange:(NSNotification *)aNotification
+{
+	[self play:nil];
+}
+
 
 @end

Playback.m

@@ -66,7 +66,7 @@ -(id)init;
 -(Sound*)playingSound; { return ps; };
 -(void)setPlayingSound:(Sound*)newPs; {
 	[newPs retain]; [ps release]; ps = newPs;
-	sound_vol = ps.volume.floatValue;
+
 }
 
 -(void)play:(Sound*)sound;
@@ -277,7 +277,7 @@ -(void) synthSample:(int)length :(float*)buffer :(FILE*)file;
 		}
 		ssample=ssample/8*master_vol;
 
-		ssample*=2.0f*sound_vol;
+		ssample*=2.0f*ps.sound_vol;
 
 		if(buffer!=NULL)
 		{
@@ -294,11 +294,11 @@ -(void) synthSample:(int)length :(float*)buffer :(FILE*)file;
 			if(ssample<-1.0f) ssample=-1.0f;
 			filesample+=ssample;
 			fileacc++;
-			if(wav_freq==44100 || fileacc==2)
+			if(ps.wav_freq==44100 || fileacc==2)
 			{
 				filesample/=fileacc;
 				fileacc=0;
-				if(wav_bits==16)
+				if(ps.wav_bits==16)
 				{
 					short isample=(short)(filesample*32000);
 					fwrite(&isample, 1, 2, file);
@@ -360,13 +360,13 @@ -(bool)exportWAV:(char*)filename;
 	fwrite(&word, 1, 2, foutput); // compression code
 	word=1;
 	fwrite(&word, 1, 2, foutput); // channels
-	dword=wav_freq;
+	dword=ps.wav_freq;
 	fwrite(&dword, 1, 4, foutput); // sample rate
-	dword=wav_freq*wav_bits/8;
+	dword=ps.wav_freq*ps.wav_bits/8;
 	fwrite(&dword, 1, 4, foutput); // bytes/sec
-	word=wav_bits/8;
+	word=ps.wav_bits/8;
 	fwrite(&word, 1, 2, foutput); // block align
-	word=wav_bits;
+	word=ps.wav_bits;
 	fwrite(&word, 1, 2, foutput); // bits per sample
 
 	fwrite("data", 4, 1, foutput); // "data"
@@ -387,10 +387,10 @@ -(bool)exportWAV:(char*)filename;
 	// seek back to header and write size info
 	fseek(foutput, 4, SEEK_SET);
 	dword=0;
-	dword=foutstream_datasize-4+file_sampleswritten*wav_bits/8;
+	dword=foutstream_datasize-4+file_sampleswritten*ps.wav_bits/8;
 	fwrite(&dword, 1, 4, foutput); // remaining file size
 	fseek(foutput, foutstream_datasize, SEEK_SET);
-	dword=file_sampleswritten*wav_bits/8;
+	dword=file_sampleswritten*ps.wav_bits/8;
 	fwrite(&dword, 1, 4, foutput); // chunk size (data)
 	fclose(foutput);
 

Sound+legacyAccessors.h

@@ -25,7 +25,6 @@
 @property (retain) NSNumber * lowpassFilterCutoffSweep;
 @property (retain) NSNumber * lowpassFilterResonance;
 @property (retain) NSNumber * minFrequencyCutoff;
-@property (retain) NSString * name;
 @property (retain) NSNumber * waveType;
 @property (retain) NSNumber * phaserOffset;
 @property (retain) NSNumber * phaserSweep;
@@ -39,9 +38,16 @@
 @property (retain) NSNumber * vibratoDepth;
 @property (retain) NSNumber * vibratoSpeed;
 @property (retain) NSNumber * volume;
+@property (retain) NSString * name;
+@property (retain) NSNumber * index;
+@property (retain) NSNumber * rating;
+
 
+@property (assign) float sound_vol;
 
 @property (assign) int   wave_type;		   // waveType
+@property (assign) int   wav_bits;
+@property (assign) int   wav_freq;
 @property (assign) float p_base_freq;      // startFrequency
 @property (assign) float p_freq_limit;     // minFrequencyCutoff
 @property (assign) float p_freq_ramp;      // slide

Sound+legacyAccessors.m

@@ -29,7 +29,8 @@
  "p_pha_ramp":        "phaserSweep",
  "p_repeat_speed":    "repeatSpeed",
  "p_arp_speed":       "changeSpeed",
- "p_arp_mod":         "changeAmount"
+ "p_arp_mod":         "changeAmount",
+ "sound_vol":		  "volume"
  }
  
  for legacyValue in legacyMap:
@@ -62,7 +63,6 @@ @implementation Sound (LegacyAccessors)
 @dynamic lowpassFilterCutoffSweep;
 @dynamic lowpassFilterResonance;
 @dynamic minFrequencyCutoff;
-@dynamic name;
 @dynamic phaserOffset;
 @dynamic phaserSweep;
 @dynamic repeatSpeed;
@@ -77,17 +77,51 @@ @implementation Sound (LegacyAccessors)
 @dynamic volume;
 @dynamic waveType;
 
-// Todo: Wave type
+@dynamic name;
+@dynamic index;
+@dynamic rating;
 
 -(int)wave_type;
 {
 	return [self.waveType intValue];
 }
+
 -(void)setWave_type:(int)waveType;
 {
 	self.waveType = [NSNumber numberWithInt:waveType];
 }
 
+-(float)sound_vol;
+{
+	return [self.volume floatValue]/100;
+}
+
+-(void)setSound_vol:(float)newVol;
+{
+	self.volume = [NSNumber numberWithInt:newVol*100.0];
+}
+
+-(int)wav_bits;
+{
+	return [self.bitDepth intValue];
+}
+
+-(void)setWav_bits:(int)w;
+{
+	self.bitDepth = [NSNumber numberWithInt:w];
+}
+
+-(int)wav_freq;
+{
+	return [self.sampleRate intValue];
+}
+
+-(void)setWav_freq:(int)w;
+{
+	self.sampleRate = [NSNumber numberWithInt:w];
+}
+
+/// GENERATED:
 -(float)p_duty_ramp;
 {
   	return [self.dutySweep floatValue];

Sound.h

@@ -11,6 +11,8 @@
 @interface Sound : NSManagedObject {
 	bool filter_on;// = false
 }
++(NSInteger)countInContext:(NSManagedObjectContext*)ctx;
++(NSInteger)highestIndexInContext:(NSManagedObjectContext*)ctx;
 
 -(void)generateParamsFromCategory:(NSString*)templateName;
 

Sound.m

@@ -10,8 +10,49 @@
 #import "common.h"
 
 @implementation Sound
-// todo: 	srand(time(NULL));
++(NSInteger)countInContext:(NSManagedObjectContext*)moc;
+{
+	NSEntityDescription *entityDescription = [NSEntityDescription
+											  entityForName:@"Sound" inManagedObjectContext:moc];
+	NSFetchRequest *request = [[[NSFetchRequest alloc] init] autorelease];
+	[request setEntity:entityDescription];
+
+	NSArray *array = [moc executeFetchRequest:request error:nil];
+	if (array == nil)
+	{
+		return 0;
+	}
+	return [array count];
+}
+
++(NSInteger)highestIndexInContext:(NSManagedObjectContext*)moc;
+{
+	NSEntityDescription *entityDescription = [NSEntityDescription
+											  entityForName:@"Sound" inManagedObjectContext:moc];
+	NSFetchRequest *request = [[[NSFetchRequest alloc] init] autorelease];
+	[request setEntity:entityDescription];
+
+	NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc]
+										initWithKey:@"index" ascending:NO];
+	[request setSortDescriptors:[NSArray arrayWithObject:sortDescriptor]];
+	[sortDescriptor release];
 
+	[request setFetchLimit:1];
+
+	NSArray *array = [moc executeFetchRequest:request error:nil];
+	if (array == nil)
+	{
+		return 1;
+	}
+	Sound *s = [array objectAtIndex:0];
+	return s.index.intValue;
+}
+
+
+- (void)awakeFromInsert
+{
+	self.index = [NSNumber numberWithInt:[Sound highestIndexInContext:[self managedObjectContext]]+1];
+}
 -(void)generateParamsFromCategory:(NSString*)templateName;
 {
 	if([@"Pickup/coin" isEqualToString:templateName]) {

main.m

@@ -10,5 +10,6 @@
 
 int main(int argc, char *argv[])
 {
+	srand(time(NULL));
     return NSApplicationMain(argc, (const char **) argv);
 }