X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flinux%2Femu.c;h=25bb05c5422a3fe6caf743f63acb3c7a6afd98d4;hb=d4d626658a7a999f48009f408b4a22d280ab80ea;hp=95666ad25ba41ab89d6172fd683a2726439be494;hpb=21ebcfd322972ea5579bb5d4bedee9e509b42785;p=picodrive.git

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 95666ad..25bb05c 100644
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -1,22 +1,23 @@
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <unistd.h>
 
+#include "../libpicofe/menu.h"
+#include "../libpicofe/plat.h"
 #include "../common/emu.h"
-#include "../common/menu.h"
-#include "../common/plat.h"
 #include "../common/arm_utils.h"
-#include "../linux/sndout_oss.h"
 #include "version.h"
 
 #include <pico/pico_int.h>
 
 
-static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };
 const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };
 enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };
@@ -168,20 +169,6 @@ void plat_video_toggle_renderer(int change, int is_menu)
 	emu_status_msg(renderer_names[currentConfig.renderer]);
 }
 
-void plat_video_menu_enter(int is_rom_loaded)
-{
-}
-
-void plat_video_menu_begin(void)
-{
-	g_menuscreen_ptr = g_screen_ptr;
-}
-
-void plat_video_menu_end(void)
-{
-	plat_video_flip();
-}
-
 void plat_status_msg_clear(void)
 {
 	unsigned short *d = (unsigned short *)g_screen_ptr + g_screen_width * g_screen_height;
@@ -220,43 +207,9 @@ void pemu_forced_frame(int no_scale, int do_emu)
 	g_menubg_src_ptr = g_screen_ptr;
 }
 
-static void oss_write_nonblocking(int len)
-{
-	// sndout_oss_can_write() is not reliable, only use with no_frmlimit
-	if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))
-		return;
-
-	sndout_oss_write_nb(PsndOut, len);
-}
-
 void pemu_sound_start(void)
 {
-	PsndOut = NULL;
-
-	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
-	{
-		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
-
-		PsndRerate(Pico.m.frame_count ? 1 : 0);
-
-		printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
-			PsndRate, PsndLen, is_stereo, Pico.m.pal);
-		sndout_oss_start(PsndRate, is_stereo, 1);
-		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
-		PicoWriteSound = oss_write_nonblocking;
-		plat_update_volume(0, 0);
-		memset(sndBuffer, 0, sizeof(sndBuffer));
-		PsndOut = sndBuffer;
-	}
-}
-
-void pemu_sound_stop(void)
-{
-}
-
-void pemu_sound_wait(void)
-{
-	// don't need to do anything, writes will block by themselves
+	emu_sound_start();
 }
 
 void plat_debug_cat(char *str)
@@ -273,14 +226,10 @@ void pemu_loop_prep(void)
 {
 	apply_renderer();
 	osd_text = osd_text16;
-
-	pemu_sound_start();
 }
 
 void pemu_loop_end(void)
 {
-	pemu_sound_stop();
-
 	/* do one more frame for menu bg */
 	pemu_forced_frame(0, 1);
 }