shithub: aacenc

Download patch

ref: 64ab658728b7dd967598fbe89f4e1d7082bad8f4
parent: d1a785b85dba42f62dfc779fbb352e2c8f153e9f
author: aforanna <aforanna>
date: Tue Oct 26 08:48:11 EDT 2004 

Imports mp4/id3 tag


--- a/plugins/cooledit/FAAC.dsp
+++ b/plugins/cooledit/FAAC.dsp
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FAAC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../faad2/common/faad" /I "../../include" /I "../../../faad2/include" /I "../../common/mp4v2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../../../faad2/common/Cfaac" /I "../../../faad2/common/id3lib/include" /I "../../include" /I "../../../faad2/include" /I "../../../faad2/common/faad" /I "../../../faad2/common/mp4v2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
@@ -69,7 +69,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FAAC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../faad2/include" /I "../../../faad2/common/faad" /I "../../common/mp4v2" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../../../faad2/common/Cfaac" /I "../../../faad2/common/id3lib/include" /I "../../include" /I "../../../faad2/include" /I "../../../faad2/common/faad" /I "../../../faad2/common/mp4v2" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x410 /d "_DEBUG"
@@ -79,7 +79,7 @@
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Programmi\Adobe\Audition 1.0\FAAC.flt" /pdbtype:sept
+# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug\FAAC.flt" /pdbtype:sept
 # SUBTRACT LINK32 /nodefaultlib /force
 
 !ENDIF 
@@ -93,18 +93,30 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\Cfaac.cpp
+SOURCE=..\..\..\faad2\common\Cfaac\Cfaac.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Cfaad.cpp
+SOURCE=..\..\..\faad2\common\Cfaac\Cfaad.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CRegistry.cpp
+SOURCE=..\..\..\faad2\common\Cfaac\CRegistry.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\faad2\common\Cfaac\CTag.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\faad2\common\Cfaac\DecDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\faad2\common\Cfaac\EncDialog.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Faac.cpp
 # End Source File
 # Begin Source File
@@ -113,7 +125,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\FAAC.rc
+SOURCE=..\..\..\faad2\common\Cfaac\FAAC.rc
 # End Source File
 # Begin Source File
 
@@ -129,22 +141,34 @@
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\Cfaac.h
+SOURCE=..\..\..\faad2\common\Cfaac\Cfaac.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Cfaad.h
+SOURCE=..\..\..\faad2\common\Cfaac\Cfaad.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\CRegistry.h
+SOURCE=..\..\..\faad2\common\Cfaac\CRegistry.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\faad2\common\Cfaac\CTag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\faad2\common\Cfaac\DecDialog.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\Defines.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\faad2\common\Cfaac\EncDialog.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\faac.h
 # End Source File
 # Begin Source File
@@ -157,8 +181,12 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\resource.h
+SOURCE=..\..\..\faad2\common\Cfaac\resource.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\faad2\common\Cfaac\TypeDef.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -165,19 +193,23 @@
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
-SOURCE=.\AudioCoding.bmp
+SOURCE=..\..\..\faad2\common\Cfaac\AudioCoding.bmp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Email.bmp
+SOURCE=..\..\..\faad2\common\Cfaac\Email.bmp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Mail.bmp
+SOURCE=..\..\..\faad2\common\Cfaac\id3v2.ico
 # End Source File
 # Begin Source File
 
-SOURCE=".\mpeg4ip-v.bmp"
+SOURCE=..\..\..\faad2\common\Cfaac\Mail.bmp
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\faad2\common\Cfaac\mpeg4ip-v.bmp"
 # End Source File
 # End Group
 # End Target
--- a/plugins/cooledit/FAAC.dsw
+++ b/plugins/cooledit/FAAC.dsw
@@ -20,10 +20,43 @@
     Begin Project Dependency
     Project_Dep_Name libmp4v2_st
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aacInfoLib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name id3lib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
 }}}
 
 ###############################################################################
 
+Project: "aacInfoLib"=.\aacInfoLib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "id3lib"=..\..\..\faad2\common\id3lib\libprj\id3lib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libfaac"=..\..\libfaac\libfaac.dsp - Package Owner=<4>
 
 Package=<5>
@@ -48,7 +81,19 @@
 
 ###############################################################################
 
-Project: "libmp4v2_st"=..\..\common\mp4v2\libmp4v2_st60.dsp - Package Owner=<4>
+Project: "libmp4v2_st"=..\..\..\faad2\common\mp4v2\libmp4v2_st60.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "zlib"=..\..\..\faad2\common\id3lib\zlib\prj\zlib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
--- a/plugins/cooledit/Faac.cpp
+++ b/plugins/cooledit/Faac.cpp
@@ -77,8 +77,10 @@
 {
 HANDLE	hOutput;
 Cfaac	tmp;
+CMyEncCfg	cfg(false);
+char	*srcFilename=tmp.getSourceFilename(cfg.TagSrcPath,lpstrFilename,cfg.TagSrcExt);
 
-	if(hOutput=tmp.Init(lpstrFilename,lSamprate,wBitsPerSample,wChannels,lSize))
+	if(hOutput=tmp.Init(srcFilename,lpstrFilename,lSamprate,wBitsPerSample,wChannels,lSize))
 	{
 	MYOUTPUT *mo;
 		GLOBALLOCK(mo,hOutput,MYOUTPUT,return NULL);
@@ -88,6 +90,7 @@
 		tmp.hOutput=NULL;
 	}
 
+	FREE_ARRAY(srcFilename);
 	return hOutput;
 }
 // *********************************************************************************************
--- a/plugins/cooledit/Readme.txt
+++ b/plugins/cooledit/Readme.txt
@@ -24,7 +24,7 @@
 To write .mp4 files:
 --------------------
 
-Check "Write .mp4" in the config dialog or
+Select "Write .mp4" in the config dialog or
 append .mp4 extension to the name of file in the "Save waveform as" dialog.
 
 ----------------------------------------------------------------------------
--- a/plugins/cooledit/aacInfoLib.dsp
+++ b/plugins/cooledit/aacInfoLib.dsp
@@ -41,6 +41,7 @@
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 MTL=midl.exe
+F90=df.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../faad2/common/faad" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
@@ -65,6 +66,7 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 MTL=midl.exe
+F90=df.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../faad2/common/faad" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x410 /d "_DEBUG"
@@ -87,11 +89,11 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\common\faad\aacinfo.c
+SOURCE=..\..\..\faad2\common\faad\aacinfo.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\common\faad\filestream.c
+SOURCE=..\..\..\faad2\common\faad\filestream.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
--- a/plugins/cooledit/defines.h
+++ b/plugins/cooledit/defines.h
@@ -20,16 +20,20 @@
 */
 
 #define APP_NAME "MPEG4-AAC"
-#define APP_VER "v2.4"
+#define APP_VER "v2.5"
 #define REGISTRY_PROGRAM_NAME "SOFTWARE\\4N\\CoolEdit\\AAC-MPEG4"
 
+//#define USE_OUTPUT_FOLDER
+#define USE_IMPORT_TAG
+#define USE_PATHEXT
+
 // *********************************************************************************************
 
 #define FREE_ARRAY(ptr) \
 { \
-	if(ptr) \
+	if(ptr!=NULL) \
 		free(ptr); \
-	ptr=0; \
+	ptr=NULL; \
 }
 
 // -----------------------------------------------------------------------------------------------
-- 
⑨