Rename AudioBinderVolume to AudioBookVolume

gonzoua · May 2, 2016 · 25b3841 · 25b3841
1 parent 109ee34
commit 25b3841
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/AudioBinder.m b/AudioBinder.m
@@ -28,7 +28,7 @@
 #import <CoreServices/CoreServices.h>
 #import <AudioToolbox/AudioConverter.h>
 #import "AudioBinder.h"
-#import "AudioBinderVolume.h"
+#import "AudioBookVolume.h"
 
 #include "ABLog.h"
 
@@ -150,7 +150,7 @@ -(void)setDelegate: (id<AudioBinderDelegate>)delegate
 
 -(void) addVolume:(NSString*)filename files:(NSArray*)files
 {
-    AudioBinderVolume *volume = [[AudioBinderVolume alloc] initWithName:filename files:files];
+    AudioBookVolume *volume = [[AudioBookVolume alloc] initWithName:filename files:files];
     [_volumes addObject:volume];
 }
 
@@ -159,7 +159,7 @@ -(BOOL)convert
     BOOL failed = NO;
     NSFileManager *fm;
     int filesConverted = 0;
-    for (AudioBinderVolume *v in _volumes) {
+    for (AudioBookVolume *v in _volumes) {
 
         if ([v.inputFiles count] == 0)
         {
@@ -209,7 +209,7 @@ -(BOOL)convert
     if (failed || _canceled)
     {
         fm = [NSFileManager defaultManager];
-        for (AudioBinderVolume *v in _volumes) 
+        for (AudioBookVolume *v in _volumes) 
             [fm removeItemAtPath:v.filename error:nil];
     }
 

diff --git a/AudioBinderWindowController.m b/AudioBinderWindowController.m
@@ -26,8 +26,8 @@
 //
 
 #import "AudioBinder.h"
-#import "AudioBinderVolume.h"
-#import "AudioBinderVolume.h"
+#import "AudioBookVolume.h"
+#import "AudioBookVolume.h"
 #import "AudioBinderWindowController.h"
 #import "AudioBookBinderAppDelegate.h"
 #import "AudioFile.h"
@@ -745,7 +745,7 @@ - (void)bindToFileThread:(id)object
 
                 int track = 1;
                 NSArray *volumes = [_binder volumes];
-                for (AudioBinderVolume *v in volumes) {
+                for (AudioBookVolume *v in volumes) {
                     NSString *volumeName = v.filename;
                     MP4File *mp4 = [[MP4File alloc] initWithFileName:volumeName];
                     mp4.artist = author;
@@ -774,7 +774,7 @@ - (void)bindToFileThread:(id)object
                 if ([fileList chapterMode]) {
                     [currentFile setStringValue:TEXT_ADDING_CHAPTERS];
                     int idx = 0;
-                    for (AudioBinderVolume *v in volumes) {
+                    for (AudioBookVolume *v in volumes) {
                         addChapters([v.filename UTF8String], [volumeChapters objectAtIndex:idx]);
                         idx++;
                     }
@@ -784,7 +784,7 @@ - (void)bindToFileThread:(id)object
                 if ([[NSUserDefaults standardUserDefaults] boolForKey:kConfigAddToITunes]) {
 
                     [currentFile setStringValue:TEXT_ADDING_TO_ITUNES];
-                    for(AudioBinderVolume *volume in volumes)
+                    for(AudioBookVolume *volume in volumes)
                         [self addFileToiTunes:volume.filename];
                 }
 

diff --git a/AudioBookBinder.xcodeproj/project.pbxproj b/AudioBookBinder.xcodeproj/project.pbxproj
@@ -19,9 +19,9 @@
 		9F1FFD60185E7955005EF748 /* AudioBinderWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F1FFD5E185E7955005EF748 /* AudioBinderWindow.xib */; };
 		9F1FFD681862A27D005EF748 /* StatsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1FFD671862A27D005EF748 /* StatsManager.m */; };
 		9F455945116AF4FB00BA501C /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 9F455944116AF4FB00BA501C /* Credits.rtf */; };
-		9F61BE3811FBBC8D00654B3B /* AudioBinderVolume.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9F61BE3611FBBC8D00654B3B /* AudioBinderVolume.h */; };
-		9F61BE3A11FBBC8D00654B3B /* AudioBinderVolume.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F61BE3711FBBC8D00654B3B /* AudioBinderVolume.m */; };
-		9F61BE3B11FBBC8D00654B3B /* AudioBinderVolume.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F61BE3711FBBC8D00654B3B /* AudioBinderVolume.m */; };
+		9F61BE3811FBBC8D00654B3B /* AudioBookVolume.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9F61BE3611FBBC8D00654B3B /* AudioBookVolume.h */; };
+		9F61BE3A11FBBC8D00654B3B /* AudioBookVolume.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F61BE3711FBBC8D00654B3B /* AudioBookVolume.m */; };
+		9F61BE3B11FBBC8D00654B3B /* AudioBookVolume.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F61BE3711FBBC8D00654B3B /* AudioBookVolume.m */; };
 		9F62872C1194D502000D3A05 /* CoverImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F62872B1194D502000D3A05 /* CoverImageView.m */; };
 		9F6FA21611191A020047728F /* AudioBinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F02CE11101EA8B100AE315D /* AudioBinder.m */; };
 		9F6FA21711191A020047728F /* MP4Atom.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F86C0CE1023D99300E65B00 /* MP4Atom.m */; };
@@ -67,7 +67,7 @@
 			dstSubfolderSpec = 0;
 			files = (
 				8DD76F9F0486AA7600D96B5E /* AudioBookBinder.1 in CopyFiles */,
-				9F61BE3811FBBC8D00654B3B /* AudioBinderVolume.h in CopyFiles */,
+				9F61BE3811FBBC8D00654B3B /* AudioBookVolume.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
@@ -109,8 +109,8 @@
 		9F1FFD671862A27D005EF748 /* StatsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatsManager.m; sourceTree = "<group>"; };
 		9F3A5BEF12F4D04600528495 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		9F455944116AF4FB00BA501C /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
-		9F61BE3611FBBC8D00654B3B /* AudioBinderVolume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioBinderVolume.h; sourceTree = "<group>"; };
-		9F61BE3711FBBC8D00654B3B /* AudioBinderVolume.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioBinderVolume.m; sourceTree = "<group>"; };
+		9F61BE3611FBBC8D00654B3B /* AudioBookVolume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioBookVolume.h; sourceTree = "<group>"; };
+		9F61BE3711FBBC8D00654B3B /* AudioBookVolume.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioBookVolume.m; sourceTree = "<group>"; };
 		9F62872A1194D502000D3A05 /* CoverImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoverImageView.h; sourceTree = "<group>"; };
 		9F62872B1194D502000D3A05 /* CoverImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoverImageView.m; sourceTree = "<group>"; };
 		9F6FA206111918F10047728F /* AudioBookBinder.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AudioBookBinder.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -213,14 +213,14 @@
 				9F02CE65101FF8D900AE315D /* ABLog.m */,
 				9F02CE10101EA8B100AE315D /* AudioBinder.h */,
 				9F02CE11101EA8B100AE315D /* AudioBinder.m */,
-				9F61BE3611FBBC8D00654B3B /* AudioBinderVolume.h */,
-				9F61BE3711FBBC8D00654B3B /* AudioBinderVolume.m */,
 				9F1FFD5B185D6F8F005EF748 /* AudioBinderWindowController.h */,
 				9F1FFD5C185D6F8F005EF748 /* AudioBinderWindowController.m */,
 				32A70AAB03705E1F00C91783 /* AudioBookBinder_Prefix.pch */,
 				9F6FA3BD11191AEA0047728F /* AudioBookBinder.m */,
 				9F6FA3E2111BBD640047728F /* AudioBookBinderAppDelegate.h */,
 				9F6FA3E3111BBD640047728F /* AudioBookBinderAppDelegate.m */,
+				9F61BE3611FBBC8D00654B3B /* AudioBookVolume.h */,
+				9F61BE3711FBBC8D00654B3B /* AudioBookVolume.m */,
 				9F6FA4A7111E56090047728F /* AudioFile.h */,
 				9F6FA4A8111E56090047728F /* AudioFile.m */,
 				9F6FA40F111D161A0047728F /* AudioFileList.h */,
@@ -422,7 +422,7 @@
 				9FB4DE0811C05C0E007B3DDE /* MetaEditor.mm in Sources */,
 				9FA52D9211C2F100003FD879 /* AudioFile.m in Sources */,
 				9FA52DA011C2FFCE003FD879 /* Chapter.m in Sources */,
-				9F61BE3A11FBBC8D00654B3B /* AudioBinderVolume.m in Sources */,
+				9F61BE3A11FBBC8D00654B3B /* AudioBookVolume.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -445,7 +445,7 @@
 				9F62872C1194D502000D3A05 /* CoverImageView.m in Sources */,
 				9FB4DE0711C05C0E007B3DDE /* MetaEditor.mm in Sources */,
 				9FA52D9F11C2FFCE003FD879 /* Chapter.m in Sources */,
-				9F61BE3B11FBBC8D00654B3B /* AudioBinderVolume.m in Sources */,
+				9F61BE3B11FBBC8D00654B3B /* AudioBookVolume.m in Sources */,
 				9F1FFD5D185D6F8F005EF748 /* AudioBinderWindowController.m in Sources */,
 				9F1FFD681862A27D005EF748 /* StatsManager.m in Sources */,
 			);

diff --git a/AudioBinderVolume.h → AudioBookVolume.h b/AudioBinderVolume.h → AudioBookVolume.h
@@ -28,7 +28,7 @@
 #import <Foundation/Foundation.h>
 
 
-@interface AudioBinderVolume : NSObject {
+@interface AudioBookVolume : NSObject {
     NSString *filename;
     NSMutableArray *inputFiles;
 }

diff --git a/AudioBinderVolume.m → AudioBookVolume.m b/AudioBinderVolume.m → AudioBookVolume.m
@@ -25,10 +25,10 @@
 //  SUCH DAMAGE.
 //
 
-#import "AudioBinderVolume.h"
+#import "AudioBookVolume.h"
 
 
-@implementation AudioBinderVolume
+@implementation AudioBookVolume
 @synthesize filename, inputFiles;
 
 - (id)initWithName:(NSString*)name files:(NSArray*)files

diff --git a/abbinder.m b/abbinder.m
@@ -31,7 +31,7 @@
 #include <getopt.h>
 
 #import "AudioBinder.h"
-#import "AudioBinderVolume.h"
+#import "AudioBookVolume.h"
 #import "ABLog.h"
 #import "ConsoleDelegate.h"
 #import "AudioFile.h"
@@ -437,7 +437,7 @@ int main (int argc, char * argv[]) {
     }
 
     int track = 1;
-    for (AudioBinderVolume *v in volumes) {
+    for (AudioBookVolume *v in volumes) {
         NSString *volumeName = v.filename;
         MP4File *mp4 = [[MP4File alloc] initWithFileName:volumeName];
         mp4.artist = bookAuthor;
@@ -467,7 +467,7 @@ int main (int argc, char * argv[]) {
             fflush(stdout);
         }
         int idx = 0;
-        for (AudioBinderVolume *v in volumes) {
+        for (AudioBookVolume *v in volumes) {
             addChapters([v.filename UTF8String], [volumeChapters objectAtIndex:idx]);
             idx++;
         }
@@ -481,7 +481,7 @@ int main (int argc, char * argv[]) {
     }
 
     if (addToiTunes) {
-        for (AudioBinderVolume *v in volumes) {
+        for (AudioBookVolume *v in volumes) {
             NSString *volume = v.filename;
             NSDictionary* errorDict;
             NSAppleEventDescriptor* returnDescriptor = NULL;