From dd7f3d28dfda43e6ed80d2dec59b4b73f0de2bd4 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 16 Jun 2008 08:59:49 +0000
Subject: [PATCH] =?UTF-8?q?JPEG=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E3=81=AFUIG=E3=83=A9=E3=83=B3?=
 =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=81=A7=E4=BD=BF=E7=94=A8=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84=E5=8F=AF=E8=83=BD=E6=80=A7=E3=81=8C?=
 =?UTF-8?q?=E5=87=BA=E3=81=A6=E3=81=8D=E3=81=9F=E3=81=AE=E3=81=A7=20?=
 =?UTF-8?q?=E3=82=B7=E3=83=A3=E3=83=83=E3=82=BF=E3=83=BC=E9=9F=B3=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E5=88=86?=
 =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=97=E3=81=8B?=
 =?UTF-8?q?=E7=A2=BA=E4=BF=9D=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=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@1635 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/src/main.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c
index 23b978d3..feac436c 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/ARM9/dsp_jpeg_dec.h>
+#include <twl/dsp/common/shutter.h>
 #include <twl/camera.h>
 #include "launcher.h"
 #include "misc.h"
@@ -219,23 +219,20 @@ void TwlMain( void )
 
     // DSP初期化
     {
-        FSFile file[1];
-        MIWramSize sizeB = MI_WRAM_SIZE_128KB;
-        MIWramSize sizeC = MI_WRAM_SIZE_128KB;
-        int slotB = CreateDspSlotBitmap( DSP_SLOT_B_COMPONENT_JPEGDECODER );  // ２スロット
-        int slotC = CreateDspSlotBitmap( DSP_SLOT_C_COMPONENT_JPEGDECODER );  // ４スロット
+        MIWramSize sizeB = MI_WRAM_SIZE_32KB;
+        MIWramSize sizeC = MI_WRAM_SIZE_64KB;
+        int slotB = CreateDspSlotBitmap( DSP_SLOT_B_COMPONENT_G711 );  // １スロット
+        int slotC = CreateDspSlotBitmap( DSP_SLOT_C_COMPONENT_G711 );  // ２スロット
 
-        FS_InitFile( file );
-        DSP_OpenStaticComponentJpegDecoder( file );
         MI_FreeWramSlot_B( 0, sizeB, MI_WRAM_ARM9 );
         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_LoadJpegDecoder( file, slotB, slotC ) )
+        if ( ! DSP_LoadShutter() )
         {
-            OS_TPanic("failed to load JpegDecoder DSP-component! (lack of WRAM-B/C)");
+            OS_TPanic("failed to load Shutter DSP-component! (lack of WRAM-B/C)");
         }
-        DSP_UnloadJpegDecoder();
+        DSP_UnloadShutter();
     }
 #endif // INIT_DEVICES_LIKE_UIG_LAUNCHER