shithub: aacdec

Download patch

ref: c1dd89578af9826ca60903b962f40d8b0e11c62a
parent: 283d7384fb6480fdfa6ef47cf28bfb83d5d7329b
author: menno <menno>
date: Sun Feb 17 06:09:51 EST 2002 

Winamp3 plugin updated for Winamp3 beta 3


--- a/plugins/winamp3/cnv_aacpcm.cpp
+++ b/plugins/winamp3/cnv_aacpcm.cpp
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: cnv_aacpcm.cpp,v 1.1 2002/01/21 20:38:34 menno Exp $
+** $Id: cnv_aacpcm.cpp,v 1.2 2002/02/17 11:09:51 menno Exp $
 **/
 
 #include "cnv_aacpcm.h"
@@ -26,7 +26,6 @@
 WAComponentClient *the = &wac;
 
 #include "sdk/studio/services/servicei.h"
-static waServiceT<svc_mediaConverter, AacPcm> aacpcm;
 
 // {3AF667AD-3CF8-459e-8C7C-BD8CD1D6F8C2}
 static const GUID guid =
@@ -33,19 +32,13 @@
 { 0x3af667ad, 0x3cf8, 0x459e, { 0x8c, 0x7c, 0xbd, 0x8c, 0xd1, 0xd6, 0xf8, 0xc2 } };
 
 
-WACNAME::WACNAME() : CfgItemI("AAC files support")
+WACNAME::WACNAME() : WAComponentClient("AAC files support")
 {
-#ifdef FORTIFY
-    FortifySetName("cnv_aacpcm.wac");
-    FortifyEnterScope();
-#endif
+    registerService(new waServiceT<svc_mediaConverter, AacPcm>);
 }
 
 WACNAME::~WACNAME()
 {
-#ifdef FORTIFY
-    FortifyLeaveScope();
-#endif
 }
 
 GUID WACNAME::getGUID()
@@ -55,12 +48,5 @@
 
 void WACNAME::onRegisterServices()
 {
-    api->service_register(&aacpcm);
     api->core_registerExtension("*.aac", "AAC Files");
-}
-
-void WACNAME::onDestroy()
-{
-    api->service_deregister(&aacpcm);
-    WAComponentClient::onDestroy();
 }
--- a/plugins/winamp3/cnv_aacpcm.dsp
+++ b/plugins/winamp3/cnv_aacpcm.dsp
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /W3 /GX /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_MEAN_AND_LEAN" /YX /FD /c
+# ADD CPP /nologo /G6 /W3 /GX /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_MEAN_AND_LEAN" /D "WACLIENT_NOICONSUPPORT" /D "USE_ASM" /D "cnv_aacpcm_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "NDEBUG"
@@ -69,7 +69,7 @@
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_MEAN_AND_LEAN" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_MEAN_AND_LEAN" /D "WACLIENT_NOICONSUPPORT" /D "USE_ASM" /D "cnv_aacpcm_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x413 /d "_DEBUG"
@@ -90,7 +90,7 @@
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "sdk source"
+# Begin Group "wa3sdk"
 
 # PROP Default_Filter ""
 # Begin Source File
@@ -103,22 +103,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\sdk\attribs\attrint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\bitmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\blending.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\canvas.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\sdk\attribs\cfgitemi.cpp
 # End Source File
 # Begin Source File
@@ -131,15 +115,15 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\sdk\common\nsGUID.cpp
+SOURCE=.\sdk\common\memblock.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sdk\common\pathparse.cpp
+SOURCE=.\sdk\common\nsGUID.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sdk\common\playstring.cpp
+SOURCE=.\sdk\common\pathparse.cpp
 # End Source File
 # Begin Source File
 
@@ -147,10 +131,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\sdk\common\region.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\sdk\studio\services\servicei.cpp
 # End Source File
 # Begin Source File
@@ -182,185 +162,9 @@
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "sdk"
+# Begin Group "wa3sdk_h"
 
 # PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\sdk\studio\api.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\apihelp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\attribs\attrcb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\attribs\attribute.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\attribs\attrint.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\basewnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\bitmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\blending.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\canvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\attribs\cfgitem.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\attribs\cfgitemi.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\chunklist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\compdb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\corecb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\depend.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\drag.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\fontdef.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\guid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\mediainfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\multimap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\named.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\nsGUID.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\pair.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\pathparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\platform\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\playstring.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\ptrlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\region.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\rootcomp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\rootwnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\scriptvar.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\services\service.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\services\servicei.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\services\services.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\std.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\services\svc_fileread.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\services\svc_mediaconverter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\tlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\vcputypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\common\virtualwnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdk\studio\wac.h
-# End Source File
 # End Group
 # Begin Source File
 
--- a/plugins/winamp3/cnv_aacpcm.h
+++ b/plugins/winamp3/cnv_aacpcm.h
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: cnv_aacpcm.h,v 1.1 2002/01/21 20:38:34 menno Exp $
+** $Id: cnv_aacpcm.h,v 1.2 2002/02/17 11:09:51 menno Exp $
 **/
 
 #ifndef _CNV_AACPCM_H
@@ -29,21 +29,15 @@
 
 #define WACNAME WACcnv_aacpcm
 
-class WACNAME : public WAComponentClient, public CfgItemI
+class WACNAME : public WAComponentClient
 {
 public:
     WACNAME();
     virtual ~WACNAME();
 
-    virtual const char *getName() { return "AAC to PCM converter"; };
     virtual GUID getGUID();
 
     virtual void onRegisterServices();
-    virtual void onDestroy();
-
-    virtual int getDisplayComponent() { return FALSE; };
-
-    virtual CfgItem *getCfgInterface(int n) { return this; }
 };
 
 #endif