Navigation

← Previous Changeset
Next Changeset →

Changeset 656

Timestamp:

08/08/07 13:50:35 (1 year ago)

Author:

astrange

Message:

Rename the files for the subtitle renderer, in order to replace them; update Ragel.

Files:

trunk/Perian.xcodeproj/project.pbxproj (modified) (9 diffs)
trunk/Subtitles (added)
trunk/Subtitles/SubATSUIRenderer.h (moved) (moved from trunk/SSARenderCodec.h)
trunk/Subtitles/SubATSUIRenderer.m (moved) (moved from trunk/SSARenderCodec.m) (1 diff)
trunk/Subtitles/SubContext.h (moved) (moved from trunk/SSADocument.h)
trunk/Subtitles/SubContext.m (moved) (moved from trunk/SSADocument.m) (1 diff)
trunk/Subtitles/SubImport.h (moved) (moved from trunk/SubImport.h)
trunk/Subtitles/SubImport.mm (moved) (moved from trunk/SubImport.mm) (1 diff)
trunk/Subtitles/SubParsing.h (moved) (moved from trunk/SSATagParsing.h) (1 diff)
trunk/Subtitles/SubParsing.m.rl (moved) (moved from trunk/SSATagParsing.m.rl) (1 diff)
trunk/Subtitles/SubUtilities.h (moved) (moved from trunk/Categories.h)
trunk/Subtitles/SubUtilities.m (moved) (moved from trunk/Categories.m) (1 diff)
trunk/Subtitles/ragel (moved) (moved from trunk/ragel)
trunk/Subtitles/rlgen-cd (moved) (moved from trunk/rlcodegen)
trunk/TextSubCodec.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Perian.xcodeproj/project.pbxproj

r621	r656
105	105	11F28DAD0B52EB75000AF78C /* SUUpdateAlert.m in Sources / = {isa = PBXBuildFile; fileRef = 11F28DAC0B52EB75000AF78C / SUUpdateAlert.m */; };
106	106	3D211A1D0B6B18880051299D /* Foundation.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F539CD110B62BC82005A72C9 / Foundation.framework */; };
107		3D211A200B6B1A540051299D /* S~~SADocument.m in Sources / = {isa = PBXBuildFile; fileRef = 3D211A1F0B6B1A540051299D / SSADocumen~~t.m */; };
108		3D211A230B6B1A660051299D /* ~~Categories.m in Sources / = {isa = PBXBuildFile; fileRef = 3D211A220B6B1A660051299D / Categor~~ies.m */; };
109		3D211A300B6B1AD80051299D /* S~~SATagParsing.m.rl in Sources / = {isa = PBXBuildFile; fileRef = 3D211A2F0B6B1AD80051299D / SSATag~~Parsing.m.rl */; };
	107	3D211A200B6B1A540051299D /* SubContext.m in Sources / = {isa = PBXBuildFile; fileRef = 3D211A1F0B6B1A540051299D / SubContext.m */; };
	108	3D211A230B6B1A660051299D /* SubUtilities.m in Sources / = {isa = PBXBuildFile; fileRef = 3D211A220B6B1A660051299D / SubUtilities.m */; };
	109	3D211A300B6B1AD80051299D /* SubParsing.m.rl in Sources / = {isa = PBXBuildFile; fileRef = 3D211A2F0B6B1AD80051299D / SubParsing.m.rl */; };
110	110	3D41BEB40BCD3B510069E7C2 /* libuniversaldetector.a in Frameworks / = {isa = PBXBuildFile; fileRef = 3D41BE9A0BCD3B330069E7C2 / libuniversaldetector.a */; };
111	111	3D4A7A990B5533BC004C5D6A /* ColorConversions.c in Sources / = {isa = PBXBuildFile; fileRef = 3D4A7A980B5533BC004C5D6A / ColorConversions.c */; settings = {COMPILER_FLAGS = "-O3 -fno-reorder-blocks -fweb"; }; };
112	112	3DAD32DA0B6DB26100DA0A72 /* StdIOCallback.cpp in Sources / = {isa = PBXBuildFile; fileRef = 61CB114D0ACDF3C2007994BD / StdIOCallback.cpp */; };
113		3DB2BB290B6C92F000416863 /* S~~SARenderCodec.m in Sources / = {isa = PBXBuildFile; fileRef = 3DB2BB280B6C92F000416863 / SSARenderCodec~~.m */; };
	113	3DB2BB290B6C92F000416863 /* SubATSUIRenderer.m in Sources / = {isa = PBXBuildFile; fileRef = 3DB2BB280B6C92F000416863 / SubATSUIRenderer.m */; };
114	114	6116E5510B43C27B0020F1CE /* ACBaseCodec.cpp in Sources / = {isa = PBXBuildFile; fileRef = 6116E5370B43C27B0020F1CE / ACBaseCodec.cpp */; };
115	115	6116E5520B43C27B0020F1CE /* ACCodec.cpp in Sources / = {isa = PBXBuildFile; fileRef = 6116E5390B43C27B0020F1CE / ACCodec.cpp */; };
…	…
263	263	"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).dot",
264	264	);
265		script = "RAGEL=${PROJECT_DIR}/~~ragel\nRLCODEGEN=${PROJECT_DIR}/rlcodegen\n${RAGEL} ${INPUT_FILE_PATH} \| ${RLCODEGEN} -T0 -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE} \|\| exit~~\n";
	265	script = "RAGEL=${PROJECT_DIR}/Subtitles/ragel\nRLCODEGEN=${PROJECT_DIR}/Subtitles/rlgen-cd\n${RAGEL} ${INPUT_FILE_PATH} \| ${RLCODEGEN} -T0 -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}\n";
266	266	};
267	267	/* End PBXBuildRule section */
…	…
481	481	11F28DAB0B52EB75000AF78C /* SUUpdateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateAlert.h; sourceTree = "<group>"; };
482	482	11F28DAC0B52EB75000AF78C /* SUUpdateAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateAlert.m; sourceTree = "<group>"; };
483		3D211A1E0B6B1A540051299D /* S~~SADocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SSADocumen~~t.h; sourceTree = "<group>"; };
484		3D211A1F0B6B1A540051299D /* S~~SADocument.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SSADocumen~~t.m; sourceTree = "<group>"; };
485		3D211A210B6B1A660051299D /* ~~Categories.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Categor~~ies.h; sourceTree = "<group>"; };
486		3D211A220B6B1A660051299D /* ~~Categories.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Categor~~ies.m; sourceTree = "<group>"; };
487		3D211A2E0B6B1AD80051299D /* S~~SATagParsing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SSATag~~Parsing.h; sourceTree = "<group>"; };
488		3D211A2F0B6B1AD80051299D /* S~~SATagParsing.m.rl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = SSATag~~Parsing.m.rl; sourceTree = "<group>"; };
	483	3D211A1E0B6B1A540051299D /* SubContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SubContext.h; path = Subtitles/SubContext.h; sourceTree = "<group>"; };
	484	3D211A1F0B6B1A540051299D /* SubContext.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SubContext.m; path = Subtitles/SubContext.m; sourceTree = "<group>"; };
	485	3D211A210B6B1A660051299D /* SubUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SubUtilities.h; path = Subtitles/SubUtilities.h; sourceTree = "<group>"; };
	486	3D211A220B6B1A660051299D /* SubUtilities.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SubUtilities.m; path = Subtitles/SubUtilities.m; sourceTree = "<group>"; };
	487	3D211A2E0B6B1AD80051299D /* SubParsing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SubParsing.h; path = Subtitles/SubParsing.h; sourceTree = "<group>"; };
	488	3D211A2F0B6B1AD80051299D /* SubParsing.m.rl */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; name = SubParsing.m.rl; path = Subtitles/SubParsing.m.rl; sourceTree = "<group>"; };
489	489	3D41BE8C0BCD3B330069E7C2 /* UniversalDetector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UniversalDetector.xcodeproj; path = UniversalDetector/UniversalDetector.xcodeproj; sourceTree = "<group>"; };
490	490	3D41BEBC0BCD63510069E7C2 /* UniversalDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UniversalDetector.h; path = UniversalDetector/UniversalDetector.h; sourceTree = "<group>"; };
491	491	3D4A7A970B5533BC004C5D6A /* ColorConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorConversions.h; sourceTree = "<group>"; };
492	492	3D4A7A980B5533BC004C5D6A /* ColorConversions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ColorConversions.c; sourceTree = "<group>"; };
493		3DB2BB270B6C92F000416863 /* S~~SARenderCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSARenderCodec~~.h; sourceTree = "<group>"; };
494		3DB2BB280B6C92F000416863 /* S~~SARenderCodec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSARenderCodec~~.m; sourceTree = "<group>"; };
	493	3DB2BB270B6C92F000416863 /* SubATSUIRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubATSUIRenderer.h; path = Subtitles/SubATSUIRenderer.h; sourceTree = "<group>"; };
	494	3DB2BB280B6C92F000416863 /* SubATSUIRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SubATSUIRenderer.m; path = Subtitles/SubATSUIRenderer.m; sourceTree = "<group>"; };
495	495	6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ACBaseCodec.cpp; sourceTree = "<group>"; };
496	496	6116E5380B43C27B0020F1CE /* ACBaseCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACBaseCodec.h; sourceTree = "<group>"; };
…	…
628	628	61CB11CA0ACDF50F007994BD /* KaxTrackVideo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = KaxTrackVideo.cpp; path = libmatroska/src/KaxTrackVideo.cpp; sourceTree = "<group>"; };
629	629	61CB11CB0ACDF50F007994BD /* KaxVersion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = KaxVersion.cpp; path = libmatroska/src/KaxVersion.cpp; sourceTree = "<group>"; };
630		61D514DC0ADF3DBA00A671E1 /* SubImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; ~~path =~~ SubImport.h; sourceTree = "<group>"; };
631		61D514DD0ADF3DBA00A671E1 /* SubImport.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; ~~path =~~ SubImport.mm; sourceTree = "<group>"; };
	630	61D514DC0ADF3DBA00A671E1 /* SubImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubImport.h; path = Subtitles/SubImport.h; sourceTree = "<group>"; };
	631	61D514DD0ADF3DBA00A671E1 /* SubImport.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = SubImport.mm; path = Subtitles/SubImport.mm; sourceTree = "<group>"; };
632	632	61D517710AE0402E00A671E1 /* CommonUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonUtils.h; sourceTree = "<group>"; };
633	633	61D517720AE0402E00A671E1 /* CommonUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CommonUtils.c; sourceTree = "<group>"; };
…	…
820	820	61D517720AE0402E00A671E1 /* CommonUtils.c */,
821	821	6116E74E0B4738CE0020F1CE /* CodecIDs.h */,
822		3D211A210B6B1A660051299D /* ~~Categor~~ies.h */,
823		3D211A220B6B1A660051299D /* ~~Categor~~ies.m */,
	822	3D211A210B6B1A660051299D /* SubUtilities.h */,
	823	3D211A220B6B1A660051299D /* SubUtilities.m */,
824	824	3D41BEBC0BCD63510069E7C2 /* UniversalDetector.h */,
825	825	);
…	…
935	935	children = (
936	936	3D41BE8C0BCD3B330069E7C2 /* UniversalDetector.xcodeproj */,
937		3D211A2E0B6B1AD80051299D /* S~~SATag~~Parsing.h */,
938		3D211A2F0B6B1AD80051299D /* S~~SATag~~Parsing.m.rl */,
939		3D211A1E0B6B1A540051299D /* S~~SADocumen~~t.h */,
940		3D211A1F0B6B1A540051299D /* S~~SADocumen~~t.m */,
	937	3D211A2E0B6B1AD80051299D /* SubParsing.h */,
	938	3D211A2F0B6B1AD80051299D /* SubParsing.m.rl */,
	939	3D211A1E0B6B1A540051299D /* SubContext.h */,
	940	3D211A1F0B6B1A540051299D /* SubContext.m */,
941	941	613CD51A0AD1FB650098A825 /* TextSubCodec.c */,
942	942	613CD51B0AD1FB650098A825 /* TextSubCodec.h */,
…	…
947	947	61D514DC0ADF3DBA00A671E1 /* SubImport.h */,
948	948	61D514DD0ADF3DBA00A671E1 /* SubImport.mm */,
949		3DB2BB270B6C92F000416863 /* S~~SARenderCodec~~.h */,
950		3DB2BB280B6C92F000416863 /* S~~SARenderCodec~~.m */,
	949	3DB2BB270B6C92F000416863 /* SubATSUIRenderer.h */,
	950	3DB2BB280B6C92F000416863 /* SubATSUIRenderer.m */,
951	951	);
952	952	name = Subtitles;
…	…
1590	1590	buildActionMask = 2147483647;
1591	1591	files = (
1592		3D211A300B6B1AD80051299D /* S~~SATag~~Parsing.m.rl in Sources */,
	1592	3D211A300B6B1AD80051299D /* SubParsing.m.rl in Sources */,
1593	1593	11C85ED80A641E6400DF3D73 /* ff_dataref.c in Sources */,
1594	1594	11C85EDA0A641E6400DF3D73 /* ff_private.c in Sources */,
…	…
1615	1615	F52286260B50625E00F8CF7D /* bitstream_info.c in Sources */,
1616	1616	3D4A7A990B5533BC004C5D6A /* ColorConversions.c in Sources */,
1617		3D211A200B6B1A540051299D /* S~~SADocumen~~t.m in Sources */,
1618		3D211A230B6B1A660051299D /* ~~Categor~~ies.m in Sources */,
1619		3DB2BB290B6C92F000416863 /* S~~SARenderCodec~~.m in Sources */,
	1617	3D211A200B6B1A540051299D /* SubContext.m in Sources */,
	1618	3D211A230B6B1A660051299D /* SubUtilities.m in Sources */,
	1619	3DB2BB290B6C92F000416863 /* SubATSUIRenderer.m in Sources */,
1620	1620	3DAD32DA0B6DB26100DA0A72 /* StdIOCallback.cpp in Sources */,
1621	1621	6156986F0BCDA87700E17ADE /* ringbuffer.cpp in Sources */,

trunk/Subtitles/SubATSUIRenderer.m

r622	r656
19	19	*/
20	20
21		#import "S~~SARenderCodec~~.h"
22		#import "S~~SADocumen~~t.h"
23		#import "S~~SATag~~Parsing.h"
	21	#import "SubATSUIRenderer.h"
	22	#import "SubContext.h"
	23	#import "SubParsing.h"
24	24
25	25	typedef struct SSARenderGlobals

trunk/Subtitles/SubContext.m

r654	r656
19	19	*/
20	20
21		#import "S~~SADocumen~~t.h"
22		#import "~~Categor~~ies.h"
	21	#import "SubContext.h"
	22	#import "SubUtilities.h"
23	23	#include "SubImport.h"
24	24	#include "Codecprintf.h"

trunk/Subtitles/SubImport.mm

r654	r656
10	10	#include <QuickTime/QuickTime.h>
11	11	#import "SubImport.h"
12		#import "~~Categor~~ies.h"
	12	#import "SubUtilities.h"
13	13	#include "CommonUtils.h"
14	14

trunk/Subtitles/SubParsing.h

r361 r656

20 20
21 21 #import <Cocoa/Cocoa.h>
22 #import "S~~SADocumen~~t.h"
22 #import "SubContext.h"
23 23
24 24 @interface SSAStyleSpan : NSObject

trunk/Subtitles/SubParsing.m.rl

r654	r656
19	19	*/
20	20
21		#import "S~~SATag~~Parsing.h"
22		#import "~~Categor~~ies.h"
	21	#import "SubParsing.h"
	22	#import "SubUtilities.h"
23	23
24	24	@implementation SSAStyleSpan

trunk/Subtitles/SubUtilities.m

r654 r656

7 7 //
8 8
9 #import "~~Categor~~ies.h"
9 #import "SubUtilities.h"
10 10 #import "UniversalDetector.h"
11 11 #import "Codecprintf.h"
trunk/TextSubCodec.c

r646 r656

10 10
11 11 #include "TextSubCodec.h"
12 #include "S~~SARenderCodec~~.h"
12 #include "SubATSUIRenderer.h"
13 13
14 14 // Constants

r361	r656
20	20
21	21	#import <Cocoa/Cocoa.h>
22		#import "S~~SADocumen~~t.h"
	22	#import "SubContext.h"
23	23
24	24	@interface SSAStyleSpan : NSObject

r654	r656
7	7	//
8	8
9		#import "~~Categor~~ies.h"
	9	#import "SubUtilities.h"
10	10	#import "UniversalDetector.h"
11	11	#import "Codecprintf.h"

r646	r656
10	10
11	11	#include "TextSubCodec.h"
12		#include "S~~SARenderCodec~~.h"
	12	#include "SubATSUIRenderer.h"
13	13
14	14	// Constants

Navigation

Changeset 656

Legend:

Download in other formats: