From 25afc40222050051317071f8227a5025b3fd2f34 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 14 Jul 2008 05:07:13 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B7=E3=83=A3=E3=83=83=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=E9=9F=B3=E5=B0=82=E7=94=A8DSP=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E5=89=8A=E9=99=A4=E3=81=AB=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1869 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/src/main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c
index 32dae584..9da81c9a 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/main.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c
@@ -17,7 +17,7 @@
 
 #include <twl.h>
 #include <twl/dsp.h>
-#include <twl/dsp/common/shutter.h>
+#include <twl/dsp/common/g711.h>
 #include <twl/camera.h>
 #include <sysmenu/errorLog.h>
 #include "launcher.h"
@@ -233,7 +233,7 @@ void TwlMain( void )
 
 	// [TODO]カメラが接続されていないと無限ループになる！！注意！！
     // カメラ初期化
- //   CAMERA_Init();
+//    CAMERA_Init();
 
     // end時間計測１-b
 #if (MEASURE_TIME == 1)
@@ -243,6 +243,7 @@ void TwlMain( void )
 #ifdef USE_HYENA_COMPONENT
     // DSP初期化
     {
+        FSFile  file[1];
         MIWramSize sizeB = MI_WRAM_SIZE_32KB;
         MIWramSize sizeC = MI_WRAM_SIZE_64KB;
         int slotB = CreateDspSlotBitmap( DSP_SLOT_B_COMPONENT_G711 );  // １スロット
@@ -252,11 +253,13 @@ void TwlMain( void )
         MI_FreeWramSlot_C( 0, sizeC, MI_WRAM_ARM9 );
         MI_CancelWramSlot_B( 0, sizeB, MI_WRAM_ARM9 );
         MI_CancelWramSlot_C( 0, sizeC, MI_WRAM_ARM9 );
-        if ( ! DSP_LoadShutter() )
+        FS_InitFile(file);
+        DSPi_OpenStaticComponentG711Core(file);
+        if ( ! DSP_LoadG711(file, slotB, slotC) )
         {
-            OS_TPanic("failed to load Shutter DSP-component! (lack of WRAM-B/C)");
+            OS_TPanic("failed to load G.711 DSP-component! (lack of WRAM-B/C)");
         }
-        DSP_UnloadShutter();
+        DSP_UnloadG711();
     }
 #endif // USE_HYENA_COMPONENT
 #endif // INIT_DEVICES_LIKE_UIG_LAUNCHER