]> Chaos Git - corbenik/ctrulib.git/commitdiff
updated sound example for new API
authorLectem <lectem@gmail.com>
Tue, 7 Jul 2015 20:21:47 +0000 (22:21 +0200)
committerLectem <lectem@gmail.com>
Tue, 7 Jul 2015 20:48:03 +0000 (22:48 +0200)
examples/audio/mic/source/main.c

index 2726a75df5904f1bd293adc07c3f23941d05f4eb..ca3ac65f08ba3c0a4231fb060f877519336c2cdd 100644 (file)
@@ -14,8 +14,13 @@ int main()
        u32 audio_initialized = 0;
 
        gfxInitDefault();
+       consoleInit(GFX_BOTTOM, NULL);
 
-       if(CSND_initialize(NULL)==0)audio_initialized = 1;
+       if(csndInit()==0)
+       {
+               printf("Init success\n");
+               audio_initialized = 1;
+       }
 
        sharedmem = (u32*)memalign(0x1000, sharedmem_size);
        audiobuf = linearAlloc(audiobuf_size);
@@ -38,13 +43,14 @@ int main()
                        if(kDown & KEY_A)
                        {
                                audiobuf_pos = 0;
-
-                               CSND_setchannel_playbackstate(0x8, 0);//Stop audio playback.
-                               CSND_sharedmemtype0_cmdupdatestate(0);
+                               printf("Stopping audio playback\n");
+                               CSND_SetPlayState(0x8, 0);//Stop audio playback.
+                               CSND_UpdateInfo(0);
 
                                MIC_SetRecording(1);
 
                                memset(framebuf, 0x20, 0x46500);
+                               printf("Now recording\n");
                        }
 
                        if((hidKeysHeld() & KEY_A) && audiobuf_pos < audiobuf_size)
@@ -57,9 +63,10 @@ int main()
 
                        if(hidKeysUp() & KEY_A)
                        {
+                               printf("Playing the recorded sample\n");
                                MIC_SetRecording(0);
                                GSPGPU_FlushDataCache(NULL, audiobuf, audiobuf_pos);
-                               CSND_playsound(0x8, CSND_LOOP_DISABLE, CSND_ENCODING_PCM16, 16000, (u32*)audiobuf, NULL, audiobuf_pos, 2, 0);
+                               csndPlaySound(0x8, SOUND_ONE_SHOT | SOUND_FORMAT_16BIT, 16000, 1.0, 0.0, (u32*)audiobuf, NULL, audiobuf_pos);
 
                                memset(framebuf, 0xe0, 0x46500);
 
@@ -77,7 +84,7 @@ int main()
 
        MIC_Shutdown();
 
-       if(audio_initialized)CSND_shutdown();
+       if(audio_initialized)csndExit();
 
        free(sharedmem);
        linearFree(audiobuf);