Use SDL for sound plugin, reverted the change to BIAS in r48024. (and I'm too lazy to hunt down the bug with x64 dynarec :( feel free to revert this revert if not preferred :P)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48308 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
parent
b24d4d3cd3
commit
0956549379
27
ChangeLog
27
ChangeLog
|
@ -1,3 +1,30 @@
|
|||
May 19, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
|
||||
|
||||
* plugins/dfsound/sdl.c: Use SDL for Sound Plugin.
|
||||
* plugins/dfsound/oss.c: Removed OSS, PulseAudio, ALSA & NULL sound code.
|
||||
* plugins/dfsound/pulseaudio.c: Likewise.
|
||||
* plugins/dfsound/nullsnd.c: Likewise.
|
||||
* plugins/dfsound/alsa.c: Likewise.
|
||||
* plugins/dfsound/spu.c: Removed OSS/PulseAudio/ALSA/NULL plugin names,
|
||||
added SDL plugin name.
|
||||
* debian/control: Removed libasound2-dev.
|
||||
* debian/rules: Removed --enable-alsa.
|
||||
* configure.ac: Removed SDL, PulseAudio & OSS stuff.
|
||||
* plugins/dfsound/Makefile.am: Likewise.
|
||||
* po/pt_BR.po, po/it.po, po/zh_TW.po, po/ru_RU.po, po/pcsx.pot, po/zh_CN.po:
|
||||
Updated.
|
||||
* libpcsxcore/psxinterpreter.c: Reverted the change to how BIAS was handled in
|
||||
r48024, which was causing problems with x64 dynarec core.
|
||||
* libpcsxcore/ppc/pR3000A.c: Likewise.
|
||||
* libpcsxcore/cdrom.c: Likewise.
|
||||
* libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
|
||||
* libpcsxcore/r3000a.c: Likewise.
|
||||
* libpcsxcore/mdec.c: Likewise.
|
||||
* libpcsxcore/ix86/iR3000A.c: Likewise.
|
||||
* libpcsxcore/sio.c: Likewise.
|
||||
* libpcsxcore/psxdma.c: Likewise.
|
||||
* libpcsxcore/psxcounters.c: Likewise.
|
||||
|
||||
May 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
|
||||
|
||||
* libpcsxcore/plugins.c: Added brackets around CheckErr() and LoadSym().
|
||||
|
|
|
@ -104,8 +104,6 @@ GZIP_ENV = --best
|
|||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -185,8 +183,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -754,16 +754,6 @@ NASM
|
|||
X86_NASM_FALSE
|
||||
X86_NASM_TRUE
|
||||
PEOPSXGL
|
||||
HAVE_ALSA_FALSE
|
||||
HAVE_ALSA_TRUE
|
||||
PULSEAUDIO_LIBS
|
||||
PULSEAUDIO_CFLAGS
|
||||
ALSA_LIBS
|
||||
ALSA_CFLAGS
|
||||
HAVE_PULSEAUDIO_FALSE
|
||||
HAVE_PULSEAUDIO_TRUE
|
||||
HAVE_OSS_FALSE
|
||||
HAVE_OSS_TRUE
|
||||
SDL_LIBS
|
||||
SDL_CFLAGS
|
||||
SDL_CONFIG
|
||||
|
@ -927,8 +917,6 @@ with_libintl_prefix
|
|||
with_sdl_prefix
|
||||
with_sdl_exec_prefix
|
||||
enable_sdltest
|
||||
enable_alsa
|
||||
enable_pulseaudio
|
||||
enable_opengl
|
||||
enable_dynarec
|
||||
'
|
||||
|
@ -949,11 +937,7 @@ GLIB2_LIBS
|
|||
GTK2_CFLAGS
|
||||
GTK2_LIBS
|
||||
GLADE2_CFLAGS
|
||||
GLADE2_LIBS
|
||||
ALSA_CFLAGS
|
||||
ALSA_LIBS
|
||||
PULSEAUDIO_CFLAGS
|
||||
PULSEAUDIO_LIBS'
|
||||
GLADE2_LIBS'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
@ -1586,8 +1570,6 @@ Optional Features:
|
|||
--disable-nls do not use Native Language Support
|
||||
--disable-rpath do not hardcode runtime library paths
|
||||
--disable-sdltest Do not try to compile and run a test SDL program
|
||||
--enable-alsa use ALSA sound output (default=no)
|
||||
--enable-pulseaudio use PulseAudio sound output (default=no)
|
||||
--enable-opengl build OpenGL plugin (default=no)
|
||||
--enable-dynarec=... force selection of dynamic recompiler platform (x86, x86_64, ppc) (default: autodetect)
|
||||
|
||||
|
@ -1625,12 +1607,6 @@ Some influential environment variables:
|
|||
GLADE2_CFLAGS
|
||||
C compiler flags for GLADE2, overriding pkg-config
|
||||
GLADE2_LIBS linker flags for GLADE2, overriding pkg-config
|
||||
ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
|
||||
ALSA_LIBS linker flags for ALSA, overriding pkg-config
|
||||
PULSEAUDIO_CFLAGS
|
||||
C compiler flags for PULSEAUDIO, overriding pkg-config
|
||||
PULSEAUDIO_LIBS
|
||||
linker flags for PULSEAUDIO, overriding pkg-config
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
@ -4762,13 +4738,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
|
|||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
(eval echo "\"\$as_me:4765: $ac_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:4741: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:4768: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval echo "\"\$as_me:4744: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:4771: output\"" >&5)
|
||||
(eval echo "\"\$as_me:4747: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
|
@ -5974,7 +5950,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5977 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5953 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
@ -7470,11 +7446,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7473: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7449: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7477: \$? = $ac_status" >&5
|
||||
echo "$as_me:7453: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
@ -7809,11 +7785,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7812: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7788: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7816: \$? = $ac_status" >&5
|
||||
echo "$as_me:7792: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
@ -7914,11 +7890,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7893: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7921: \$? = $ac_status" >&5
|
||||
echo "$as_me:7897: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
@ -7969,11 +7945,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7972: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7948: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7976: \$? = $ac_status" >&5
|
||||
echo "$as_me:7952: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
@ -10353,7 +10329,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10356 "configure"
|
||||
#line 10332 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -10449,7 +10425,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10452 "configure"
|
||||
#line 10428 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -13463,246 +13439,6 @@ then
|
|||
CFLAGS="$CFLAGS -fno-dse"
|
||||
fi
|
||||
|
||||
if false; then
|
||||
HAVE_OSS_TRUE=
|
||||
HAVE_OSS_FALSE='#'
|
||||
else
|
||||
HAVE_OSS_TRUE='#'
|
||||
HAVE_OSS_FALSE=
|
||||
fi
|
||||
|
||||
if false; then
|
||||
HAVE_PULSEAUDIO_TRUE=
|
||||
HAVE_PULSEAUDIO_FALSE='#'
|
||||
else
|
||||
HAVE_PULSEAUDIO_TRUE='#'
|
||||
HAVE_PULSEAUDIO_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-alsa was given.
|
||||
if test "${enable_alsa+set}" = set; then :
|
||||
enableval=$enable_alsa; BUILD_ALSA="$enableval"
|
||||
else
|
||||
BUILD_ALSA="no"
|
||||
fi
|
||||
|
||||
# Check whether --enable-pulseaudio was given.
|
||||
if test "${enable_pulseaudio+set}" = set; then :
|
||||
enableval=$enable_pulseaudio; BUILD_PULSEAUDIO="$enableval"
|
||||
else
|
||||
BUILD_PULSEAUDIO="no"
|
||||
fi
|
||||
|
||||
|
||||
if test "$BUILD_ALSA" = "yes"; then
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
|
||||
$as_echo_n "checking for ALSA... " >&6; }
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$ALSA_CFLAGS"; then
|
||||
pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$ALSA_LIBS"; then
|
||||
pkg_cv_ALSA_LIBS="$ALSA_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 1.0.0"`
|
||||
else
|
||||
ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 1.0.0"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$ALSA_PKG_ERRORS" >&5
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
have_alsa=no
|
||||
elif test $pkg_failed = untried; then
|
||||
have_alsa=no
|
||||
else
|
||||
ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
|
||||
ALSA_LIBS=$pkg_cv_ALSA_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
have_alsa=yes
|
||||
fi
|
||||
elif test "$BUILD_PULSEAUDIO" = "yes"; then
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5
|
||||
$as_echo_n "checking for PULSEAUDIO... " >&6; }
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PULSEAUDIO_CFLAGS"; then
|
||||
pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.16\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.16") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.16" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PULSEAUDIO_LIBS"; then
|
||||
pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.16\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.16") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.16" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse >= 0.9.16"`
|
||||
else
|
||||
PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse >= 0.9.16"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$PULSEAUDIO_PKG_ERRORS" >&5
|
||||
|
||||
as_fn_error "Package requirements (libpulse >= 0.9.16) were not met:
|
||||
|
||||
$PULSEAUDIO_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
|
||||
and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" "$LINENO" 5
|
||||
elif test $pkg_failed = untried; then
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
|
||||
and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
|
||||
See \`config.log' for more details." "$LINENO" 5; }
|
||||
else
|
||||
PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS
|
||||
PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
have_pulseaudio=yes
|
||||
fi
|
||||
else
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then :
|
||||
have_oss=yes
|
||||
else
|
||||
have_oss=no
|
||||
fi
|
||||
|
||||
|
||||
if test "x$have_oss" = xno; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sys/soundcard.h not found. Using NULL sound output" >&5
|
||||
$as_echo "$as_me: WARNING: sys/soundcard.h not found. Using NULL sound output" >&2;}
|
||||
else
|
||||
if true; then
|
||||
HAVE_OSS_TRUE=
|
||||
HAVE_OSS_FALSE='#'
|
||||
else
|
||||
HAVE_OSS_TRUE='#'
|
||||
HAVE_OSS_FALSE=
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$have_alsa" = xyes; then
|
||||
HAVE_ALSA_TRUE=
|
||||
HAVE_ALSA_FALSE='#'
|
||||
else
|
||||
HAVE_ALSA_TRUE='#'
|
||||
HAVE_ALSA_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
if test "x$have_pulseaudio" = xyes; then
|
||||
HAVE_PULSEAUDIO_TRUE=
|
||||
HAVE_PULSEAUDIO_FALSE='#'
|
||||
else
|
||||
HAVE_PULSEAUDIO_TRUE='#'
|
||||
HAVE_PULSEAUDIO_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_zlib_h" = x""yes; then :
|
||||
have_zlib=yes
|
||||
|
@ -14342,26 +14078,6 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
|
|||
as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then
|
||||
as_fn_error "conditional \"HAVE_OSS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_PULSEAUDIO_TRUE}" && test -z "${HAVE_PULSEAUDIO_FALSE}"; then
|
||||
as_fn_error "conditional \"HAVE_PULSEAUDIO\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then
|
||||
as_fn_error "conditional \"HAVE_OSS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
|
||||
as_fn_error "conditional \"HAVE_ALSA\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_PULSEAUDIO_TRUE}" && test -z "${HAVE_PULSEAUDIO_FALSE}"; then
|
||||
as_fn_error "conditional \"HAVE_PULSEAUDIO\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${X86_NASM_TRUE}" && test -z "${X86_NASM_FALSE}"; then
|
||||
as_fn_error "conditional \"X86_NASM\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
|
|
29
configure.ac
29
configure.ac
|
@ -47,35 +47,6 @@ then
|
|||
CFLAGS="$CFLAGS -fno-dse"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(HAVE_OSS, false)
|
||||
AM_CONDITIONAL(HAVE_PULSEAUDIO, false)
|
||||
|
||||
dnl Check for ALSA 1.x, OSS, or PulseAudio
|
||||
|
||||
AC_ARG_ENABLE(alsa, [ --enable-alsa use ALSA sound output (default=no)],
|
||||
[ BUILD_ALSA="$enableval" ],[ BUILD_ALSA="no" ])
|
||||
AC_ARG_ENABLE(pulseaudio, [ --enable-pulseaudio use PulseAudio sound output (default=no)],
|
||||
[ BUILD_PULSEAUDIO="$enableval" ],[ BUILD_PULSEAUDIO="no" ])
|
||||
|
||||
if test "$BUILD_ALSA" = "yes"; then
|
||||
PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, have_alsa=yes, have_alsa=no)
|
||||
elif test "$BUILD_PULSEAUDIO" = "yes"; then
|
||||
PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= 0.9.16, have_pulseaudio=yes)
|
||||
else
|
||||
AC_CHECK_HEADER(sys/soundcard.h, have_oss=yes, have_oss=no)
|
||||
if test "x$have_oss" = xno; then
|
||||
AC_MSG_WARN([sys/soundcard.h not found. Using NULL sound output])
|
||||
else
|
||||
AM_CONDITIONAL(HAVE_OSS, true)
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(HAVE_ALSA,test "x$have_alsa" = xyes)
|
||||
AC_SUBST(ALSA_LIBS)
|
||||
AM_CONDITIONAL(HAVE_PULSEAUDIO,test "x$have_pulseaudio" = xyes)
|
||||
AC_SUBST(PULSEAUDIO_CFLAGS)
|
||||
AC_SUBST(PULSEAUDIO_LIBS)
|
||||
|
||||
AC_CHECK_HEADER(zlib.h, have_zlib=yes, have_zlib=no)
|
||||
if test "x$have_zlib" = xno; then
|
||||
AC_MSG_ERROR([unable to find libz headers])
|
||||
|
|
|
@ -72,8 +72,6 @@ am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"
|
|||
DATA = $(desktop_DATA) $(glade_DATA)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -153,8 +151,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -2,7 +2,7 @@ Source: pcsxr
|
|||
Section: otherosfs
|
||||
Priority: extra
|
||||
Maintainer: Wei Mingzhi <whistler@openoffice.org>
|
||||
Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libasound2-dev, libsdl1.2-dev
|
||||
Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev
|
||||
Standards-Version: 3.7.3
|
||||
|
||||
Package: pcsxr
|
||||
|
|
|
@ -22,7 +22,7 @@ CONFIGURE_PARAM = \
|
|||
--bindir=/usr/games \
|
||||
--mandir=\$${prefix}/share/man \
|
||||
--infodir=\$${prefix}/share/info \
|
||||
--enable-opengl --enable-alsa
|
||||
--enable-opengl
|
||||
|
||||
config.status: configure
|
||||
dh_testdir
|
||||
|
|
|
@ -73,8 +73,6 @@ NROFF = nroff
|
|||
MANS = $(man_MANS)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -154,8 +152,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -74,8 +74,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -155,8 +153,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -173,8 +173,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -254,8 +252,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -85,8 +85,8 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
|
|||
|
||||
// 1x = 75 sectors per second
|
||||
// PSXCLK = 1 sec in the ps
|
||||
// so (PSXCLK / 75) = cdr read time (linuzappz)
|
||||
#define cdReadTime (PSXCLK / 75)
|
||||
// so (PSXCLK / 75) / BIAS = cdr read time (linuzappz)
|
||||
#define cdReadTime ((PSXCLK / 75) / BIAS)
|
||||
|
||||
static struct CdrStat stat;
|
||||
static struct SubQ *subq;
|
||||
|
@ -1057,9 +1057,9 @@ void cdrWrite3(unsigned char rt) {
|
|||
cdr.Irq = 0;
|
||||
return;
|
||||
}
|
||||
if (cdr.Irq)
|
||||
if (cdr.Irq)
|
||||
CDR_INT(cdr.eCycle);
|
||||
if (cdr.Reading && !cdr.ResultReady)
|
||||
if (cdr.Reading && !cdr.ResultReady)
|
||||
CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
|
||||
|
||||
return;
|
||||
|
@ -1068,7 +1068,7 @@ void cdrWrite3(unsigned char rt) {
|
|||
cdr.Readed = 1;
|
||||
cdr.pTransfer = cdr.Transfer;
|
||||
|
||||
switch (cdr.Mode&0x30) {
|
||||
switch (cdr.Mode & 0x30) {
|
||||
case 0x10:
|
||||
case 0x00:
|
||||
cdr.pTransfer += 12;
|
||||
|
|
|
@ -97,7 +97,7 @@ static void iFlushRegs() {
|
|||
|
||||
static void iRet() {
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((u32)&psxRegs.cycle, count);
|
||||
if (resp) ADD32ItoR(ESP, resp);
|
||||
RET();
|
||||
|
@ -148,7 +148,7 @@ static void SetBranch() {
|
|||
iFlushRegs();
|
||||
MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold) / 4;
|
||||
ADD32ItoM((u32)&psxRegs.cycle, count);
|
||||
if (resp) ADD32ItoR(ESP, resp);
|
||||
|
||||
|
@ -180,7 +180,7 @@ static void iJump(u32 branchPC) {
|
|||
iFlushRegs();
|
||||
MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((u32)&psxRegs.cycle, count);
|
||||
if (resp) ADD32ItoR(ESP, resp);
|
||||
|
||||
|
@ -199,7 +199,7 @@ static void iJump(u32 branchPC) {
|
|||
MOV32ItoM((u32)&psxRegs.pc, branchPC);
|
||||
CALLFunc((u32)psxBranchTest);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((u32)&psxRegs.cycle, count);
|
||||
if (resp) ADD32ItoR(ESP, resp);
|
||||
|
||||
|
@ -236,7 +236,7 @@ static void iBranch(u32 branchPC, int savectx) {
|
|||
iFlushRegs();
|
||||
MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
|
||||
/* store cycle */
|
||||
count = (((pc+4) - pcold) / 4) * BIAS;
|
||||
count = ((pc+4) - pcold)/4;
|
||||
ADD32ItoM((u32)&psxRegs.cycle, count);
|
||||
if (resp) ADD32ItoR(ESP, resp);
|
||||
|
||||
|
@ -256,7 +256,7 @@ static void iBranch(u32 branchPC, int savectx) {
|
|||
MOV32ItoM((u32)&psxRegs.pc, branchPC);
|
||||
CALLFunc((u32)psxBranchTest);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((u32)&psxRegs.cycle, count);
|
||||
if (resp) ADD32ItoR(ESP, resp);
|
||||
|
||||
|
|
|
@ -110,7 +110,7 @@ static void iFlushRegs() {
|
|||
|
||||
static void iRet() {
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((uptr)&psxRegs.cycle, count);
|
||||
StackRes();
|
||||
RET();
|
||||
|
@ -161,7 +161,7 @@ static void SetBranch() {
|
|||
iFlushRegs();
|
||||
MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((uptr)&psxRegs.cycle, count);
|
||||
|
||||
//PUSH64M((uptr)&target);
|
||||
|
@ -193,7 +193,7 @@ static void iJump(u32 branchPC) {
|
|||
iFlushRegs();
|
||||
MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((uptr)&psxRegs.cycle, count);
|
||||
|
||||
//PUSHI(branchPC);
|
||||
|
@ -213,7 +213,7 @@ static void iJump(u32 branchPC) {
|
|||
MOV32ItoM((uptr)&psxRegs.pc, branchPC);
|
||||
CALLFunc((uptr)psxBranchTest);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((uptr)&psxRegs.cycle, count);
|
||||
StackRes();
|
||||
|
||||
|
@ -257,7 +257,7 @@ static void iBranch(u32 branchPC, int savectx) {
|
|||
iFlushRegs();
|
||||
MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
|
||||
/* store cycle */
|
||||
count = (((pc+4) - pcold) / 4) * BIAS;
|
||||
count = ((pc+4) - pcold)/4;
|
||||
ADD32ItoM((uptr)&psxRegs.cycle, count);
|
||||
//if (resp) ADD32ItoR(ESP, resp);
|
||||
|
||||
|
@ -278,7 +278,7 @@ static void iBranch(u32 branchPC, int savectx) {
|
|||
MOV32ItoM((uptr)&psxRegs.pc, branchPC);
|
||||
CALLFunc((uptr)psxBranchTest);
|
||||
/* store cycle */
|
||||
count = ((pc - pcold) / 4) * BIAS;
|
||||
count = (pc - pcold)/4;
|
||||
ADD32ItoM((uptr)&psxRegs.cycle, count);
|
||||
|
||||
StackRes();
|
||||
|
@ -415,8 +415,6 @@ static int recInit() {
|
|||
recRAM = mmap(0,
|
||||
0x280000*PTRMULT,
|
||||
PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
||||
//recRAM = (uptr*) malloc(0x200000 * sizeof(void*));
|
||||
//recROM = (uptr*) malloc(0x080000 * sizeof(void*));
|
||||
recROM = &recRAM[0x200000*PTRMULT];
|
||||
|
||||
if (recRAM == NULL || recROM == NULL || recMem == NULL || psxRecLUT == NULL) {
|
||||
|
@ -452,11 +450,8 @@ static void recReset() {
|
|||
static void recShutdown() {
|
||||
if (recMem == NULL) return;
|
||||
free(psxRecLUT);
|
||||
//free(recMem);
|
||||
munmap(recMem, RECMEM_SIZE + PTRMULT*0x1000);
|
||||
//free(recRAM);
|
||||
munmap(recRAM, 0x280000*PTRMULT);
|
||||
//free(recROM);
|
||||
x86Shutdown();
|
||||
}
|
||||
|
||||
|
@ -2344,7 +2339,7 @@ REC_SYS(SYSCALL);
|
|||
REC_SYS(BREAK);
|
||||
#endif
|
||||
|
||||
int dump;
|
||||
int dump = 0;
|
||||
|
||||
#if 1
|
||||
static void recSYSCALL() {
|
||||
|
@ -2878,7 +2873,7 @@ static void recRecompile() {
|
|||
char *p;
|
||||
char *ptr;
|
||||
|
||||
dump=0;
|
||||
dump = 0;
|
||||
resp = 0;
|
||||
|
||||
/* if x86Ptr reached the mem limit reset whole mem */
|
||||
|
@ -2966,4 +2961,3 @@ R3000Acpu psxRec = {
|
|||
recClear,
|
||||
recShutdown
|
||||
};
|
||||
|
||||
|
|
|
@ -516,18 +516,18 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
|
|||
image = (u16 *)PSXM(adr);
|
||||
|
||||
if (mdec.reg0 & MDEC0_RGB24) { // 15-b decoding
|
||||
// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/);
|
||||
MDECOUTDMA_INT((size / 4));
|
||||
// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS);
|
||||
MDECOUTDMA_INT((size / 4) / BIAS);
|
||||
size = size / ((16 * 16) / 2);
|
||||
for (; size > 0; size--, image += (16 * 16)) {
|
||||
mdec.rl = rl2blk(blk, mdec.rl);
|
||||
yuv2rgb15(blk, image);
|
||||
}
|
||||
} else { // 24-b decoding
|
||||
// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/);
|
||||
MDECOUTDMA_INT((size / 4));
|
||||
// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS);
|
||||
MDECOUTDMA_INT((size / 4) / BIAS);
|
||||
size = size / ((24 * 16) / 2);
|
||||
for (; size>0; size--, image += (24 * 16)) {
|
||||
for (; size > 0; size--, image += (24 * 16)) {
|
||||
mdec.rl = rl2blk(blk, mdec.rl);
|
||||
yuv2rgb24(blk, (u8 *)image);
|
||||
}
|
||||
|
@ -546,9 +546,9 @@ void mdec1Interrupt() {
|
|||
// PSXCLK / 1000 seems good for FF9. (for FF9 need < ~28000)
|
||||
// CAUTION: commented interrupt-handling may lead to problems, keep an eye ;-)
|
||||
MDECOUTDMA_INT(PSXCLK / 1000);
|
||||
// psxRegs.interrupt |= 0x02000000;
|
||||
// psxRegs.intCycle[5 + 24 + 1] *= 8;
|
||||
// psxRegs.intCycle[5 + 24] = psxRegs.cycle;
|
||||
// psxRegs.interrupt |= 0x02000000;
|
||||
// psxRegs.intCycle[5 + 24 + 1] *= 8;
|
||||
// psxRegs.intCycle[5 + 24] = psxRegs.cycle;
|
||||
HW_DMA1_CHCR &= SWAP32(~0x01000000);
|
||||
DMA_INTERRUPT(1);
|
||||
} else {
|
||||
|
|
|
@ -741,7 +741,7 @@ static void Return()
|
|||
|
||||
static void iRet() {
|
||||
/* store cycle */
|
||||
count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4;
|
||||
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
|
||||
Return();
|
||||
}
|
||||
|
@ -793,7 +793,7 @@ static void SetBranch() {
|
|||
LIW(0, psxRegs.code);
|
||||
STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
|
||||
/* store cycle */
|
||||
count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4;
|
||||
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
|
||||
|
||||
treg = GetHWRegSpecial(TARGET);
|
||||
|
@ -816,7 +816,7 @@ static void SetBranch() {
|
|||
DisposeHWReg(GetHWRegFromCPUReg(treg));
|
||||
FlushAllHWReg();
|
||||
|
||||
count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4;
|
||||
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
|
||||
FlushAllHWReg();
|
||||
CALLFunc((u32)psxBranchTest);
|
||||
|
@ -836,7 +836,7 @@ static void iJump(u32 branchPC) {
|
|||
LIW(0, psxRegs.code);
|
||||
STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
|
||||
/* store cycle */
|
||||
count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4;
|
||||
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
|
||||
|
||||
LIW(PutHWRegSpecial(ARG2), branchPC);
|
||||
|
@ -855,7 +855,7 @@ static void iJump(u32 branchPC) {
|
|||
LIW(PutHWRegSpecial(PSXPC), branchPC);
|
||||
FlushAllHWReg();
|
||||
|
||||
count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4;
|
||||
//if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
|
||||
// LIW(PutHWRegSpecial(CYCLECOUNT), 0);
|
||||
//} else {
|
||||
|
@ -916,7 +916,7 @@ static void iBranch(u32 branchPC, int savectx) {
|
|||
LIW(0, psxRegs.code);
|
||||
STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
|
||||
/* store cycle */
|
||||
count = (idlecyclecount + ((pc+4) - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + ((pc+4) - pcold)/4;
|
||||
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
|
||||
|
||||
LIW(PutHWRegSpecial(ARG2), branchPC);
|
||||
|
@ -937,7 +937,7 @@ static void iBranch(u32 branchPC, int savectx) {
|
|||
FlushAllHWReg();
|
||||
|
||||
/* store cycle */
|
||||
count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4;
|
||||
//if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
|
||||
// LIW(PutHWRegSpecial(CYCLECOUNT), 0);
|
||||
//} else {
|
||||
|
@ -3324,7 +3324,7 @@ static void recHLE() {
|
|||
CALLFunc((u32)psxHLEt[0]); // call dummy function
|
||||
}
|
||||
|
||||
count = (idlecyclecount + (pc - pcold) / 4 + 20) * BIAS;
|
||||
count = idlecyclecount + (pc - pcold)/4 + 20;
|
||||
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
|
||||
FlushAllHWReg();
|
||||
CALLFunc((u32)psxBranchTest);
|
||||
|
|
|
@ -116,7 +116,7 @@ void _psxRcntWcount( u32 index, u32 value )
|
|||
value &= 0xffff;
|
||||
}
|
||||
|
||||
rcnts[index].cycleStart = psxRegs.cycle;
|
||||
rcnts[index].cycleStart = psxRegs.cycle * BIAS;
|
||||
rcnts[index].cycleStart -= value * rcnts[index].rate;
|
||||
|
||||
// TODO: <=.
|
||||
|
@ -137,7 +137,7 @@ u32 _psxRcntRcount( u32 index )
|
|||
{
|
||||
u32 count;
|
||||
|
||||
count = psxRegs.cycle;
|
||||
count = psxRegs.cycle * BIAS;
|
||||
count -= rcnts[index].cycleStart;
|
||||
count /= rcnts[index].rate;
|
||||
|
||||
|
@ -158,7 +158,7 @@ void psxRcntSet()
|
|||
s32 countToUpdate;
|
||||
u32 i;
|
||||
|
||||
psxNextsCounter = psxRegs.cycle;
|
||||
psxNextsCounter = psxRegs.cycle * BIAS;
|
||||
psxNextCounter = 0x7fffffff;
|
||||
|
||||
for( i = 0; i < CounterQuantity; ++i )
|
||||
|
@ -189,7 +189,7 @@ void psxRcntReset( u32 index )
|
|||
{
|
||||
if( rcnts[index].mode & RcCountToTarget )
|
||||
{
|
||||
count = psxRegs.cycle;
|
||||
count = psxRegs.cycle * BIAS;
|
||||
count -= rcnts[index].cycleStart;
|
||||
count /= rcnts[index].rate;
|
||||
count -= rcnts[index].target;
|
||||
|
@ -215,7 +215,7 @@ void psxRcntReset( u32 index )
|
|||
}
|
||||
else if( rcnts[index].counterState == CountToOverflow )
|
||||
{
|
||||
count = psxRegs.cycle;
|
||||
count = psxRegs.cycle * BIAS;
|
||||
count -= rcnts[index].cycleStart;
|
||||
count /= rcnts[index].rate;
|
||||
count -= 0xffff;
|
||||
|
@ -244,7 +244,7 @@ void psxRcntUpdate()
|
|||
{
|
||||
u32 cycle;
|
||||
|
||||
cycle = psxRegs.cycle;
|
||||
cycle = psxRegs.cycle * BIAS;
|
||||
|
||||
// rcnt 0.
|
||||
if( cycle - rcnts[0].cycleStart >= rcnts[0].cycle )
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
// Dma3 in CdRom.c
|
||||
|
||||
void spuInterrupt() {
|
||||
HW_DMA4_CHCR &= SWAP32(~0x01000000);
|
||||
DMA_INTERRUPT(4);
|
||||
HW_DMA4_CHCR &= SWAP32(~0x01000000);
|
||||
DMA_INTERRUPT(4);
|
||||
}
|
||||
|
||||
void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
|
||||
|
@ -48,7 +48,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
|
|||
break;
|
||||
}
|
||||
SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
|
||||
SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
|
||||
SPUDMA_INT(((bcr >> 16) * (bcr & 0xffff) / 2) / BIAS);
|
||||
return;
|
||||
|
||||
case 0x01000200: //spu to cpu transfer
|
||||
|
@ -63,7 +63,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
|
|||
break;
|
||||
}
|
||||
size = (bcr >> 16) * (bcr & 0xffff) * 2;
|
||||
SPU_readDMAMem(ptr, size);
|
||||
SPU_readDMAMem(ptr, size);
|
||||
psxCpu->Clear(madr, size);
|
||||
break;
|
||||
|
||||
|
@ -112,7 +112,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
|
|||
}
|
||||
size = (bcr >> 16) * (bcr & 0xffff);
|
||||
GPU_writeDataMem(ptr, size);
|
||||
GPUDMA_INT((size / 4));
|
||||
GPUDMA_INT((size / 4) / BIAS);
|
||||
return;
|
||||
|
||||
case 0x01000401: // dma chain
|
||||
|
|
|
@ -286,7 +286,7 @@ __inline void doBranch(u32 tar) {
|
|||
debugI();
|
||||
|
||||
psxRegs.pc += 4;
|
||||
psxRegs.cycle += BIAS;
|
||||
psxRegs.cycle++;
|
||||
|
||||
// check for load delay
|
||||
tmp = psxRegs.code >> 26;
|
||||
|
@ -789,7 +789,7 @@ inline void execI() {
|
|||
if (Config.Debug) ProcessDebug();
|
||||
|
||||
psxRegs.pc += 4;
|
||||
psxRegs.cycle += BIAS;
|
||||
psxRegs.cycle++;
|
||||
|
||||
psxBSC[psxRegs.code >> 26]();
|
||||
}
|
||||
|
|
|
@ -115,42 +115,42 @@ void psxBranchTest() {
|
|||
psxRcntUpdate();
|
||||
|
||||
if (psxRegs.interrupt) {
|
||||
if ((psxRegs.interrupt & 0x80) && (!Config.Sio)) { // sio
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[7]) >= psxRegs.intCycle[7+1]) {
|
||||
psxRegs.interrupt&=~0x80;
|
||||
if ((psxRegs.interrupt & 0x80) && !Config.Sio) { // sio
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[7]) >= psxRegs.intCycle[7 + 1]) {
|
||||
psxRegs.interrupt &= ~0x80;
|
||||
sioInterrupt();
|
||||
}
|
||||
}
|
||||
if (psxRegs.interrupt & 0x04) { // cdr
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[2]) >= psxRegs.intCycle[2+1]) {
|
||||
psxRegs.interrupt&=~0x04;
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[2]) >= psxRegs.intCycle[2 + 1]) {
|
||||
psxRegs.interrupt &= ~0x04;
|
||||
cdrInterrupt();
|
||||
}
|
||||
}
|
||||
if (psxRegs.interrupt & 0x040000) { // cdr read
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[2+16]) >= psxRegs.intCycle[2+16+1]) {
|
||||
psxRegs.interrupt&=~0x040000;
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[2 + 16]) >= psxRegs.intCycle[2 + 16 + 1]) {
|
||||
psxRegs.interrupt &= ~0x040000;
|
||||
cdrReadInterrupt();
|
||||
}
|
||||
}
|
||||
if (psxRegs.interrupt & 0x01000000) { // gpu dma
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[3+24]) >= psxRegs.intCycle[3+24+1]) {
|
||||
psxRegs.interrupt&=~0x01000000;
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[3 + 24]) >= psxRegs.intCycle[3 + 24 + 1]) {
|
||||
psxRegs.interrupt &= ~0x01000000;
|
||||
gpuInterrupt();
|
||||
}
|
||||
}
|
||||
if (psxRegs.interrupt & 0x02000000) { // mdec out dma
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[5+24]) >= psxRegs.intCycle[5+24+1]) {
|
||||
psxRegs.interrupt&=~0x02000000;
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[5 + 24]) >= psxRegs.intCycle[5 + 24 + 1]) {
|
||||
psxRegs.interrupt &= ~0x02000000;
|
||||
mdec1Interrupt();
|
||||
}
|
||||
}
|
||||
if (psxRegs.interrupt & 0x04000000) { // spu dma
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[1+24]) >= psxRegs.intCycle[1+24+1]) {
|
||||
psxRegs.interrupt&=~0x04000000;
|
||||
spuInterrupt();
|
||||
}
|
||||
}
|
||||
if (psxRegs.interrupt & 0x04000000) { // spu dma
|
||||
if ((psxRegs.cycle - psxRegs.intCycle[1 + 24]) >= psxRegs.intCycle[1 + 24 + 1]) {
|
||||
psxRegs.interrupt &= ~0x04000000;
|
||||
spuInterrupt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (psxHu32(0x1070) & psxHu32(0x1074)) {
|
||||
|
|
|
@ -66,14 +66,14 @@ static unsigned int padst;
|
|||
char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
|
||||
|
||||
// clk cycle byte
|
||||
// 4us * 8bits = ((PSXCLK / 1000000) * 32); (linuzappz)
|
||||
// 4us * 8bits = ((PSXCLK / 1000000) * 32) / BIAS; (linuzappz)
|
||||
// TODO: add SioModePrescaler and BaudReg
|
||||
#define SIO_INT() { \
|
||||
if (!Config.Sio) { \
|
||||
psxRegs.interrupt |= 0x80; \
|
||||
psxRegs.intCycle[7 + 1] = 400; \
|
||||
psxRegs.intCycle[7] = psxRegs.cycle; \
|
||||
} \
|
||||
static inline void SIO_INT() {
|
||||
if (!Config.Sio) {
|
||||
psxRegs.interrupt |= 0x80;
|
||||
psxRegs.intCycle[7 + 1] = 200; /*271;*/
|
||||
psxRegs.intCycle[7] = psxRegs.cycle;
|
||||
}
|
||||
}
|
||||
|
||||
void sioWrite8(unsigned char value) {
|
||||
|
|
|
@ -72,8 +72,6 @@ am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"
|
|||
DATA = $(icon_DATA) $(pixmap_DATA)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -153,8 +151,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -103,8 +103,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -184,8 +182,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -106,8 +106,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -187,8 +185,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -103,8 +103,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -184,8 +182,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -9,25 +9,11 @@ libdir = @libdir@/games/psemu/
|
|||
|
||||
lib_LTLIBRARIES = libDFSound.la
|
||||
|
||||
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c \
|
||||
alsa.c oss.c pulseaudio.c nullsnd.c
|
||||
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c sdl.c
|
||||
|
||||
libDFSound_la_CFLAGS =
|
||||
libDFSound_la_CFLAGS = `$(SDL_CONFIG) --cflags`
|
||||
libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm
|
||||
|
||||
if HAVE_ALSA
|
||||
libDFSound_la_CFLAGS += -DUSEALSA=1
|
||||
libDFSound_la_LDFLAGS += $(ALSA_LIBS)
|
||||
endif
|
||||
|
||||
if HAVE_OSS
|
||||
libDFSound_la_CFLAGS += -DUSEOSS=1
|
||||
endif
|
||||
|
||||
if HAVE_PULSEAUDIO
|
||||
libDFSound_la_CFLAGS += $(PULSEAUDIO_CFLAGS) -DUSEPULSEAUDIO=1
|
||||
libDFSound_la_LDFLAGS += $(PULSEAUDIO_LIBS)
|
||||
endif
|
||||
libDFSound_la_LDFLAGS += `$(SDL_CONFIG) --libs`
|
||||
|
||||
bin_PROGRAMS = cfgDFSound
|
||||
cfgDFSound_SOURCES = spucfg-0.1df/main.c
|
||||
|
|
|
@ -37,11 +37,6 @@ POST_UNINSTALL = :
|
|||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@HAVE_ALSA_TRUE@am__append_1 = -DUSEALSA=1
|
||||
@HAVE_ALSA_TRUE@am__append_2 = $(ALSA_LIBS)
|
||||
@HAVE_OSS_TRUE@am__append_3 = -DUSEOSS=1
|
||||
@HAVE_PULSEAUDIO_TRUE@am__append_4 = $(PULSEAUDIO_CFLAGS) -DUSEPULSEAUDIO=1
|
||||
@HAVE_PULSEAUDIO_TRUE@am__append_5 = $(PULSEAUDIO_LIBS)
|
||||
bin_PROGRAMS = cfgDFSound$(EXEEXT)
|
||||
subdir = plugins/dfsound
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
|
@ -81,8 +76,7 @@ libDFSound_la_LIBADD =
|
|||
am_libDFSound_la_OBJECTS = libDFSound_la-spu.lo libDFSound_la-cfg.lo \
|
||||
libDFSound_la-dma.lo libDFSound_la-freeze.lo \
|
||||
libDFSound_la-psemu.lo libDFSound_la-registers.lo \
|
||||
libDFSound_la-alsa.lo libDFSound_la-oss.lo \
|
||||
libDFSound_la-pulseaudio.lo libDFSound_la-nullsnd.lo
|
||||
libDFSound_la-sdl.lo
|
||||
libDFSound_la_OBJECTS = $(am_libDFSound_la_OBJECTS)
|
||||
libDFSound_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libDFSound_la_CFLAGS) \
|
||||
|
@ -112,8 +106,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -193,8 +185,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
@ -271,12 +261,10 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
|
|||
-I../../include
|
||||
|
||||
lib_LTLIBRARIES = libDFSound.la
|
||||
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c \
|
||||
alsa.c oss.c pulseaudio.c nullsnd.c
|
||||
|
||||
libDFSound_la_CFLAGS = $(am__append_1) $(am__append_3) $(am__append_4)
|
||||
libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c sdl.c
|
||||
libDFSound_la_CFLAGS = `$(SDL_CONFIG) --cflags`
|
||||
libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm \
|
||||
$(am__append_2) $(am__append_5)
|
||||
`$(SDL_CONFIG) --libs`
|
||||
cfgDFSound_SOURCES = spucfg-0.1df/main.c
|
||||
cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
|
||||
glade_DATA = spucfg-0.1df/dfsound.glade2
|
||||
|
@ -402,15 +390,12 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-alsa.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-cfg.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-dma.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-freeze.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-nullsnd.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-oss.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-psemu.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-pulseaudio.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-registers.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-sdl.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-spu.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
|
||||
|
||||
|
@ -477,33 +462,12 @@ libDFSound_la-registers.lo: registers.c
|
|||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-registers.lo `test -f 'registers.c' || echo '$(srcdir)/'`registers.c
|
||||
|
||||
libDFSound_la-alsa.lo: alsa.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-alsa.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-alsa.Tpo -c -o libDFSound_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libDFSound_la-alsa.Tpo $(DEPDIR)/libDFSound_la-alsa.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alsa.c' object='libDFSound_la-alsa.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
libDFSound_la-sdl.lo: sdl.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-sdl.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-sdl.Tpo -c -o libDFSound_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libDFSound_la-sdl.Tpo $(DEPDIR)/libDFSound_la-sdl.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdl.c' object='libDFSound_la-sdl.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c
|
||||
|
||||
libDFSound_la-oss.lo: oss.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-oss.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-oss.Tpo -c -o libDFSound_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libDFSound_la-oss.Tpo $(DEPDIR)/libDFSound_la-oss.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='oss.c' object='libDFSound_la-oss.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c
|
||||
|
||||
libDFSound_la-pulseaudio.lo: pulseaudio.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-pulseaudio.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-pulseaudio.Tpo -c -o libDFSound_la-pulseaudio.lo `test -f 'pulseaudio.c' || echo '$(srcdir)/'`pulseaudio.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libDFSound_la-pulseaudio.Tpo $(DEPDIR)/libDFSound_la-pulseaudio.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pulseaudio.c' object='libDFSound_la-pulseaudio.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-pulseaudio.lo `test -f 'pulseaudio.c' || echo '$(srcdir)/'`pulseaudio.c
|
||||
|
||||
libDFSound_la-nullsnd.lo: nullsnd.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-nullsnd.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-nullsnd.Tpo -c -o libDFSound_la-nullsnd.lo `test -f 'nullsnd.c' || echo '$(srcdir)/'`nullsnd.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libDFSound_la-nullsnd.Tpo $(DEPDIR)/libDFSound_la-nullsnd.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nullsnd.c' object='libDFSound_la-nullsnd.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-nullsnd.lo `test -f 'nullsnd.c' || echo '$(srcdir)/'`nullsnd.c
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c
|
||||
|
||||
main.o: spucfg-0.1df/main.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'spucfg-0.1df/main.c' || echo '$(srcdir)/'`spucfg-0.1df/main.c
|
||||
|
|
|
@ -1,162 +0,0 @@
|
|||
/***************************************************************************
|
||||
alsa.c - description
|
||||
-------------------
|
||||
begin : Sat Mar 01 2003
|
||||
copyright : (C) 2002 by Pete Bernert
|
||||
email : BlackDove@addcom.de
|
||||
***************************************************************************/
|
||||
/***************************************************************************
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. See also the license.txt file for *
|
||||
* additional informations. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#ifdef USEALSA
|
||||
|
||||
#define _IN_OSS
|
||||
|
||||
#include "externals.h"
|
||||
|
||||
#define ALSA_PCM_NEW_HW_PARAMS_API
|
||||
#define ALSA_PCM_NEW_SW_PARAMS_API
|
||||
#include <alsa/asoundlib.h>
|
||||
|
||||
static snd_pcm_t *handle = NULL;
|
||||
static snd_pcm_uframes_t buffer_size;
|
||||
|
||||
// SETUP SOUND
|
||||
void SetupSound(void)
|
||||
{
|
||||
snd_pcm_hw_params_t *hwparams;
|
||||
snd_pcm_status_t *status;
|
||||
unsigned int pspeed;
|
||||
int pchannels;
|
||||
int format;
|
||||
unsigned int buffer_time = 100000;
|
||||
unsigned int period_time = buffer_time / 4;
|
||||
int err;
|
||||
|
||||
if (iDisStereo) pchannels = 1;
|
||||
else pchannels=2;
|
||||
|
||||
pspeed = 44100;
|
||||
format = SND_PCM_FORMAT_S16;
|
||||
|
||||
if ((err = snd_pcm_open(&handle, "default",
|
||||
SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) < 0)
|
||||
{
|
||||
printf("Audio open error: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err = snd_pcm_nonblock(handle, 0))<0)
|
||||
{
|
||||
printf("Can't set blocking moded: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
snd_pcm_hw_params_alloca(&hwparams);
|
||||
|
||||
if((err=snd_pcm_hw_params_any(handle, hwparams))<0)
|
||||
{
|
||||
printf("Broken configuration for this PCM: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED))<0)
|
||||
{
|
||||
printf("Access type not available: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params_set_format(handle, hwparams, format))<0)
|
||||
{
|
||||
printf("Sample format not available: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params_set_channels(handle, hwparams, pchannels))<0)
|
||||
{
|
||||
printf("Channels count not available: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params_set_rate_near(handle, hwparams, &pspeed, 0))<0)
|
||||
{
|
||||
printf("Rate not available: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params_set_buffer_time_near(handle, hwparams, &buffer_time, 0))<0)
|
||||
{
|
||||
printf("Buffer time error: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params_set_period_time_near(handle, hwparams, &period_time, 0))<0)
|
||||
{
|
||||
printf("Period time error: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if((err=snd_pcm_hw_params(handle, hwparams))<0)
|
||||
{
|
||||
printf("Unable to install hw params: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
snd_pcm_status_alloca(&status);
|
||||
if((err=snd_pcm_status(handle, status))<0)
|
||||
{
|
||||
printf("Unable to get status: %s\n", snd_strerror(err));
|
||||
return;
|
||||
}
|
||||
|
||||
buffer_size = snd_pcm_status_get_avail(status);
|
||||
}
|
||||
|
||||
// REMOVE SOUND
|
||||
void RemoveSound(void)
|
||||
{
|
||||
if(handle != NULL)
|
||||
{
|
||||
snd_pcm_drop(handle);
|
||||
snd_pcm_close(handle);
|
||||
handle = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
// GET BYTES BUFFERED
|
||||
unsigned long SoundGetBytesBuffered(void)
|
||||
{
|
||||
unsigned long l;
|
||||
|
||||
if (handle == NULL) // failed to open?
|
||||
return SOUNDSIZE;
|
||||
l = snd_pcm_avail(handle);
|
||||
if (l < 0) return 0;
|
||||
if (l < buffer_size / 2) // can we write in at least the half of fragments?
|
||||
l = SOUNDSIZE; // -> no? wait
|
||||
else l = 0; // -> else go on
|
||||
|
||||
return l;
|
||||
}
|
||||
|
||||
// FEED SOUND DATA
|
||||
void SoundFeedStreamData(unsigned char* pSound,long lBytes)
|
||||
{
|
||||
if (handle == NULL) return;
|
||||
|
||||
if (snd_pcm_state(handle) == SND_PCM_STATE_XRUN)
|
||||
snd_pcm_prepare(handle);
|
||||
snd_pcm_writei(handle,pSound,
|
||||
iDisStereo ? lBytes / 2 : lBytes / 4);
|
||||
}
|
||||
|
||||
#endif
|
|
@ -1,30 +0,0 @@
|
|||
#include "stdafx.h"
|
||||
#define _IN_OSS
|
||||
#include "externals.h"
|
||||
|
||||
#if !defined (USEALSA) && !defined (USEOSS) && !defined (USEPULSEAUDIO)
|
||||
|
||||
#warning "Using NULL sound output..."
|
||||
|
||||
// SETUP SOUND
|
||||
void SetupSound(void)
|
||||
{
|
||||
}
|
||||
|
||||
// REMOVE SOUND
|
||||
void RemoveSound(void)
|
||||
{
|
||||
}
|
||||
|
||||
// GET BYTES BUFFERED
|
||||
unsigned long SoundGetBytesBuffered(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
// FEED SOUND DATA
|
||||
void SoundFeedStreamData(unsigned char* pSound,long lBytes)
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
|
@ -1,163 +0,0 @@
|
|||
/***************************************************************************
|
||||
oss.c - description
|
||||
-------------------
|
||||
begin : Wed May 15 2002
|
||||
copyright : (C) 2002 by Pete Bernert
|
||||
email : BlackDove@addcom.de
|
||||
***************************************************************************/
|
||||
/***************************************************************************
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. See also the license.txt file for *
|
||||
* additional informations. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#ifdef USEOSS
|
||||
|
||||
#define _IN_OSS
|
||||
|
||||
#include "externals.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// oss globals
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define OSS_MODE_STEREO 1
|
||||
#define OSS_MODE_MONO 0
|
||||
|
||||
#define OSS_SPEED_44100 44100
|
||||
|
||||
static int oss_audio_fd = -1;
|
||||
extern int errno;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// SETUP SOUND
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void SetupSound(void)
|
||||
{
|
||||
int pspeed=44100;
|
||||
int pstereo;
|
||||
int format;
|
||||
int fragsize = 0;
|
||||
int myfrag;
|
||||
int oss_speed, oss_stereo;
|
||||
|
||||
if(iDisStereo) pstereo=OSS_MODE_MONO;
|
||||
else pstereo=OSS_MODE_STEREO;
|
||||
|
||||
oss_speed = pspeed;
|
||||
oss_stereo = pstereo;
|
||||
|
||||
if((oss_audio_fd=open("/dev/dsp",O_WRONLY,0))==-1)
|
||||
{
|
||||
printf("Sound device not available!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if(ioctl(oss_audio_fd,SNDCTL_DSP_RESET,0)==-1)
|
||||
{
|
||||
printf("Sound reset failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// we use 64 fragments with 1024 bytes each
|
||||
|
||||
fragsize=10;
|
||||
myfrag=(63<<16)|fragsize;
|
||||
|
||||
if(ioctl(oss_audio_fd,SNDCTL_DSP_SETFRAGMENT,&myfrag)==-1)
|
||||
{
|
||||
printf("Sound set fragment failed!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
format = AFMT_S16_NE;
|
||||
|
||||
if(ioctl(oss_audio_fd,SNDCTL_DSP_SETFMT,&format) == -1)
|
||||
{
|
||||
printf("Sound format not supported!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if(format!=AFMT_S16_NE)
|
||||
{
|
||||
printf("Sound format not supported!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if(ioctl(oss_audio_fd,SNDCTL_DSP_STEREO,&oss_stereo)==-1)
|
||||
{
|
||||
printf("Stereo mode not supported!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if(oss_stereo!=1)
|
||||
{
|
||||
iDisStereo=1;
|
||||
}
|
||||
|
||||
if(ioctl(oss_audio_fd,SNDCTL_DSP_SPEED,&oss_speed)==-1)
|
||||
{
|
||||
printf("Sound frequency not supported\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if(oss_speed!=pspeed)
|
||||
{
|
||||
printf("Sound frequency not supported\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// REMOVE SOUND
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void RemoveSound(void)
|
||||
{
|
||||
if(oss_audio_fd != -1 )
|
||||
{
|
||||
close(oss_audio_fd);
|
||||
oss_audio_fd = -1;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// GET BYTES BUFFERED
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
unsigned long SoundGetBytesBuffered(void)
|
||||
{
|
||||
audio_buf_info info;
|
||||
unsigned long l;
|
||||
|
||||
if(oss_audio_fd == -1) return SOUNDSIZE;
|
||||
if(ioctl(oss_audio_fd,SNDCTL_DSP_GETOSPACE,&info)==-1)
|
||||
l=0;
|
||||
else
|
||||
{
|
||||
if(info.fragments<(info.fragstotal>>1)) // can we write in at least the half of fragments?
|
||||
l=SOUNDSIZE; // -> no? wait
|
||||
else l=0; // -> else go on
|
||||
}
|
||||
|
||||
return l;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// FEED SOUND DATA
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void SoundFeedStreamData(unsigned char* pSound,long lBytes)
|
||||
{
|
||||
if(oss_audio_fd == -1) return;
|
||||
write(oss_audio_fd,pSound,lBytes);
|
||||
}
|
||||
|
||||
#endif
|
|
@ -1,354 +0,0 @@
|
|||
/***************************************************************************
|
||||
pulseaudio.c - description
|
||||
-------------------
|
||||
begin : Thu Feb 04 2010
|
||||
copyright : (C) 2010 by Tristin Celestin
|
||||
email : cetris1@umbc.edu
|
||||
comment : Much of this was taken from simple.c, in the pulseaudio
|
||||
library
|
||||
***************************************************************************/
|
||||
/***************************************************************************
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. See also the license.txt file for *
|
||||
* additional informations. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#ifdef USEPULSEAUDIO
|
||||
|
||||
#define _IN_OSS
|
||||
|
||||
#include "externals.h"
|
||||
#include <pulse/pulseaudio.h>
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// pulseaudio structs
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
typedef struct {
|
||||
pa_threaded_mainloop *mainloop;
|
||||
pa_context *context;
|
||||
pa_mainloop_api *api;
|
||||
pa_stream *stream;
|
||||
pa_sample_spec spec;
|
||||
int first;
|
||||
} Device;
|
||||
|
||||
typedef struct {
|
||||
unsigned int frequency;
|
||||
unsigned int latency_in_msec;
|
||||
} Settings;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// pulseaudio globals
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
static Device device = {
|
||||
.mainloop = NULL,
|
||||
.api = NULL,
|
||||
.context = NULL,
|
||||
.stream = NULL
|
||||
};
|
||||
|
||||
static Settings settings = {
|
||||
.frequency = 44100,
|
||||
.latency_in_msec = 20,
|
||||
};
|
||||
|
||||
// the number of bytes written in SoundFeedStreamData
|
||||
const int mixlen = 3240;
|
||||
|
||||
// used to calculate how much space is used in the buffer, for debugging purposes
|
||||
//int maxlength = 0;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// CALLBACKS FOR THREADED MAINLOOP
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
static void context_state_cb (pa_context *context, void *userdata)
|
||||
{
|
||||
Device *dev = userdata;
|
||||
|
||||
if ((context == NULL) || (dev == NULL))
|
||||
return;
|
||||
|
||||
switch (pa_context_get_state (context))
|
||||
{
|
||||
case PA_CONTEXT_READY:
|
||||
case PA_CONTEXT_TERMINATED:
|
||||
case PA_CONTEXT_FAILED:
|
||||
pa_threaded_mainloop_signal (dev->mainloop, 0);
|
||||
break;
|
||||
|
||||
case PA_CONTEXT_UNCONNECTED:
|
||||
case PA_CONTEXT_CONNECTING:
|
||||
case PA_CONTEXT_AUTHORIZING:
|
||||
case PA_CONTEXT_SETTING_NAME:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void stream_state_cb (pa_stream *stream, void * userdata)
|
||||
{
|
||||
Device *dev = userdata;
|
||||
|
||||
if ((stream == NULL) || (dev == NULL))
|
||||
return;
|
||||
|
||||
switch (pa_stream_get_state (stream))
|
||||
{
|
||||
case PA_STREAM_READY:
|
||||
case PA_STREAM_FAILED:
|
||||
case PA_STREAM_TERMINATED:
|
||||
pa_threaded_mainloop_signal (dev->mainloop, 0);
|
||||
break;
|
||||
|
||||
case PA_STREAM_UNCONNECTED:
|
||||
case PA_STREAM_CREATING:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void stream_latency_update_cb (pa_stream *stream, void *userdata)
|
||||
{
|
||||
Device *dev = userdata;
|
||||
|
||||
if ((stream == NULL) || (dev == NULL))
|
||||
return;
|
||||
|
||||
pa_threaded_mainloop_signal (dev->mainloop, 0);
|
||||
}
|
||||
|
||||
static void stream_request_cb (pa_stream *stream, size_t length, void *userdata)
|
||||
{
|
||||
Device *dev = userdata;
|
||||
|
||||
if ((stream == NULL) || (dev == NULL))
|
||||
return;
|
||||
pa_threaded_mainloop_signal (dev->mainloop, 0);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// SETUP SOUND
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void SetupSound (void)
|
||||
{
|
||||
int error_number;
|
||||
|
||||
// Acquire mainloop ///////////////////////////////////////////////////////
|
||||
device.mainloop = pa_threaded_mainloop_new ();
|
||||
if (device.mainloop == NULL)
|
||||
{
|
||||
fprintf (stderr, "Could not acquire PulseAudio main loop\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// Acquire context ////////////////////////////////////////////////////////
|
||||
device.api = pa_threaded_mainloop_get_api (device.mainloop);
|
||||
device.context = pa_context_new (device.api, "PCSX");
|
||||
pa_context_set_state_callback (device.context, context_state_cb, &device);
|
||||
|
||||
if (device.context == NULL)
|
||||
{
|
||||
fprintf (stderr, "Could not acquire PulseAudio device context\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// Connect to PulseAudio server ///////////////////////////////////////////
|
||||
if (pa_context_connect (device.context, NULL, 0, NULL) < 0)
|
||||
{
|
||||
error_number = pa_context_errno (device.context);
|
||||
fprintf (stderr, "Could not connect to PulseAudio server: %s\n", pa_strerror(error_number));
|
||||
return;
|
||||
}
|
||||
|
||||
// Run mainloop until sever context is ready //////////////////////////////
|
||||
pa_threaded_mainloop_lock (device.mainloop);
|
||||
if (pa_threaded_mainloop_start (device.mainloop) < 0)
|
||||
{
|
||||
fprintf (stderr, "Could not start mainloop\n");
|
||||
return;
|
||||
}
|
||||
|
||||
pa_context_state_t context_state;
|
||||
context_state = pa_context_get_state (device.context);
|
||||
while (context_state != PA_CONTEXT_READY)
|
||||
{
|
||||
context_state = pa_context_get_state (device.context);
|
||||
if (! PA_CONTEXT_IS_GOOD (context_state))
|
||||
{
|
||||
error_number = pa_context_errno (device.context);
|
||||
fprintf (stderr, "Context state is not good: %s\n", pa_strerror (error_number));
|
||||
return;
|
||||
}
|
||||
else if (context_state == PA_CONTEXT_READY)
|
||||
break;
|
||||
else
|
||||
fprintf (stderr, "PulseAudio context state is %d\n", context_state);
|
||||
pa_threaded_mainloop_wait (device.mainloop);
|
||||
}
|
||||
|
||||
// Set sample spec ////////////////////////////////////////////////////////
|
||||
device.spec.format = PA_SAMPLE_S16LE;
|
||||
if (iDisStereo)
|
||||
device.spec.channels = 1;
|
||||
else
|
||||
device.spec.channels = 2;
|
||||
device.spec.rate = settings.frequency;
|
||||
|
||||
pa_buffer_attr buffer_attributes;
|
||||
buffer_attributes.tlength = pa_bytes_per_second (& device.spec) / 5;
|
||||
buffer_attributes.maxlength = buffer_attributes.tlength * 3;
|
||||
buffer_attributes.minreq = buffer_attributes.tlength / 3;
|
||||
buffer_attributes.prebuf = buffer_attributes.tlength;
|
||||
|
||||
//maxlength = buffer_attributes.maxlength;
|
||||
//fprintf (stderr, "Total space: %u\n", buffer_attributes.maxlength);
|
||||
//fprintf (stderr, "Minimum request size: %u\n", buffer_attributes.minreq);
|
||||
//fprintf (stderr, "Bytes needed before playback: %u\n", buffer_attributes.prebuf);
|
||||
//fprintf (stderr, "Target buffer size: %lu\n", buffer_attributes.tlength);
|
||||
|
||||
// Acquire new stream using spec //////////////////////////////////////////
|
||||
device.stream = pa_stream_new (device.context, "PCSX", &device.spec, NULL);
|
||||
if (device.stream == NULL)
|
||||
{
|
||||
error_number = pa_context_errno (device.context);
|
||||
fprintf (stderr, "Could not acquire new PulseAudio stream: %s\n", pa_strerror (error_number));
|
||||
return;
|
||||
}
|
||||
|
||||
// Set callbacks for server events ////////////////////////////////////////
|
||||
pa_stream_set_state_callback (device.stream, stream_state_cb, &device);
|
||||
pa_stream_set_write_callback (device.stream, stream_request_cb, &device);
|
||||
pa_stream_set_latency_update_callback (device.stream, stream_latency_update_cb, &device);
|
||||
|
||||
// Ready stream for playback //////////////////////////////////////////////
|
||||
pa_stream_flags_t flags = (pa_stream_flags_t) (PA_STREAM_ADJUST_LATENCY | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE);
|
||||
//pa_stream_flags_t flags = (pa_stream_flags_t) (PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_EARLY_REQUESTS);
|
||||
if (pa_stream_connect_playback (device.stream, NULL, &buffer_attributes, flags, NULL, NULL) < 0)
|
||||
{
|
||||
pa_context_errno (device.context);
|
||||
fprintf (stderr, "Could not connect for playback: %s\n", pa_strerror (error_number));
|
||||
return;
|
||||
}
|
||||
|
||||
// Run mainloop until stream is ready /////////////////////////////////////
|
||||
pa_stream_state_t stream_state;
|
||||
stream_state = pa_stream_get_state (device.stream);
|
||||
while (stream_state != PA_STREAM_READY)
|
||||
{
|
||||
stream_state = pa_stream_get_state (device.stream);
|
||||
|
||||
if (stream_state == PA_STREAM_READY)
|
||||
break;
|
||||
|
||||
else if (! PA_STREAM_IS_GOOD (stream_state))
|
||||
{
|
||||
error_number = pa_context_errno (device.context);
|
||||
fprintf (stderr, "Stream state is not good: %s\n", pa_strerror (error_number));
|
||||
return;
|
||||
}
|
||||
else
|
||||
fprintf (stderr, "PulseAudio stream state is %d\n", stream_state);
|
||||
pa_threaded_mainloop_wait (device.mainloop);
|
||||
}
|
||||
|
||||
pa_threaded_mainloop_unlock (device.mainloop);
|
||||
|
||||
fprintf (stderr, "PulseAudio should be connected\n");
|
||||
return;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// REMOVE SOUND
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
void RemoveSound (void)
|
||||
{
|
||||
if (device.mainloop != NULL)
|
||||
pa_threaded_mainloop_stop (device.mainloop);
|
||||
|
||||
// Release in reverse order of acquisition
|
||||
if (device.stream != NULL)
|
||||
{
|
||||
pa_stream_unref (device.stream);
|
||||
device.stream = NULL;
|
||||
|
||||
}
|
||||
if (device.context != NULL)
|
||||
{
|
||||
pa_context_disconnect (device.context);
|
||||
pa_context_unref (device.context);
|
||||
device.context = NULL;
|
||||
}
|
||||
|
||||
if (device.mainloop != NULL)
|
||||
{
|
||||
pa_threaded_mainloop_free (device.mainloop);
|
||||
device.mainloop = NULL;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// GET BYTES BUFFERED
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
unsigned long SoundGetBytesBuffered (void)
|
||||
{
|
||||
int free_space;
|
||||
int error_code;
|
||||
long latency;
|
||||
int playing = 0;
|
||||
|
||||
if ((device.mainloop == NULL) || (device.api == NULL) || ( device.context == NULL) || (device.stream == NULL))
|
||||
return SOUNDSIZE;
|
||||
|
||||
pa_threaded_mainloop_lock (device.mainloop);
|
||||
free_space = pa_stream_writable_size (device.stream);
|
||||
pa_threaded_mainloop_unlock (device.mainloop);
|
||||
|
||||
//fprintf (stderr, "Free space: %d\n", free_space);
|
||||
//fprintf (stderr, "Used space: %d\n", maxlength - free_space);
|
||||
if (free_space < mixlen * 3)
|
||||
{
|
||||
// Don't buffer anymore, just play
|
||||
//fprintf (stderr, "Not buffering.\n");
|
||||
return SOUNDSIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Buffer some sound
|
||||
//fprintf (stderr, "Buffering.\n");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// FEED SOUND DATA
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void SoundFeedStreamData (unsigned char *pSound, long lBytes)
|
||||
{
|
||||
int error_code;
|
||||
int size;
|
||||
|
||||
if (device.mainloop != NULL)
|
||||
{
|
||||
pa_threaded_mainloop_lock (device.mainloop);
|
||||
if (pa_stream_write (device.stream, pSound, lBytes, NULL, 0LL, PA_SEEK_RELATIVE) < 0)
|
||||
{
|
||||
fprintf (stderr, "Could not perform write\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
//fprintf (stderr, "Wrote %d bytes\n", lBytes);
|
||||
pa_threaded_mainloop_unlock (device.mainloop);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
|
@ -0,0 +1,135 @@
|
|||
/* SDL Driver for P.E.Op.S Sound Plugin
|
||||
* Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "externals.h"
|
||||
#include <SDL.h>
|
||||
|
||||
#define BUFFER_SIZE 11025
|
||||
|
||||
short *pSndBuffer = NULL;
|
||||
int iBufSize = 0;
|
||||
volatile int iReadPos = 0, iWritePos = 0;
|
||||
|
||||
static void SOUND_FillAudio(void *unused, Uint8 *stream, int len) {
|
||||
short *p = (short *)stream;
|
||||
|
||||
len /= sizeof(short);
|
||||
|
||||
while (iReadPos != iWritePos && len > 0) {
|
||||
*p++ = pSndBuffer[iReadPos++];
|
||||
if (iReadPos >= iBufSize) iReadPos = 0;
|
||||
--len;
|
||||
}
|
||||
|
||||
// Fill remaining space with zero
|
||||
while (len > 0) {
|
||||
*p++ = 0;
|
||||
--len;
|
||||
}
|
||||
}
|
||||
|
||||
static void InitSDL() {
|
||||
if (SDL_WasInit(SDL_INIT_EVERYTHING)) {
|
||||
SDL_InitSubSystem(SDL_INIT_AUDIO);
|
||||
} else {
|
||||
SDL_Init(SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE);
|
||||
}
|
||||
}
|
||||
|
||||
static void DestroySDL() {
|
||||
if (SDL_WasInit(SDL_INIT_EVERYTHING & ~SDL_INIT_AUDIO)) {
|
||||
SDL_QuitSubSystem(SDL_INIT_AUDIO);
|
||||
} else {
|
||||
SDL_Quit();
|
||||
}
|
||||
}
|
||||
|
||||
void SetupSound(void) {
|
||||
SDL_AudioSpec spec;
|
||||
|
||||
if (pSndBuffer != NULL) return;
|
||||
|
||||
InitSDL();
|
||||
|
||||
spec.freq = 44100;
|
||||
spec.format = AUDIO_S16SYS;
|
||||
spec.channels = iDisStereo ? 1 : 2;
|
||||
spec.samples = 1024;
|
||||
spec.callback = SOUND_FillAudio;
|
||||
|
||||
if (SDL_OpenAudio(&spec, NULL) < 0) {
|
||||
DestroySDL();
|
||||
return;
|
||||
}
|
||||
|
||||
iBufSize = BUFFER_SIZE;
|
||||
if (iDisStereo) iBufSize /= 2;
|
||||
|
||||
pSndBuffer = (short *)malloc(iBufSize * sizeof(short));
|
||||
if (pSndBuffer == NULL) {
|
||||
SDL_CloseAudio();
|
||||
return;
|
||||
}
|
||||
|
||||
iReadPos = 0;
|
||||
iWritePos = 0;
|
||||
|
||||
SDL_PauseAudio(0);
|
||||
}
|
||||
|
||||
void RemoveSound(void) {
|
||||
if (pSndBuffer == NULL) return;
|
||||
|
||||
SDL_CloseAudio();
|
||||
DestroySDL();
|
||||
|
||||
free(pSndBuffer);
|
||||
pSndBuffer = NULL;
|
||||
}
|
||||
|
||||
unsigned long SoundGetBytesBuffered(void) {
|
||||
int size;
|
||||
|
||||
if (pSndBuffer == NULL) return SOUNDSIZE;
|
||||
|
||||
size = iReadPos - iWritePos;
|
||||
if (size <= 0) size += iBufSize;
|
||||
|
||||
if (size < iBufSize / 2) return SOUNDSIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void SoundFeedStreamData(unsigned char *pSound, long lBytes) {
|
||||
short *p = (short *)pSound;
|
||||
|
||||
if (pSndBuffer == NULL) return;
|
||||
|
||||
while (lBytes > 0) {
|
||||
if (((iWritePos + 1) % iBufSize) == iReadPos) break;
|
||||
|
||||
pSndBuffer[iWritePos] = *p++;
|
||||
|
||||
++iWritePos;
|
||||
if (iWritePos >= iBufSize) iWritePos = 0;
|
||||
|
||||
lBytes -= sizeof(short);
|
||||
}
|
||||
}
|
|
@ -34,19 +34,13 @@
|
|||
#define N_(x) (x)
|
||||
#endif
|
||||
|
||||
#if defined (USEALSA)
|
||||
static char * libraryName = N_("ALSA Sound");
|
||||
#elif defined (USEMACOSX)
|
||||
#if defined (USEMACOSX)
|
||||
static char * libraryName = N_("Mac OS X Sound");
|
||||
#elif defined (USEOSS)
|
||||
static char * libraryName = N_("OSS Sound");
|
||||
#elif defined (USEPULSEAUDIO)
|
||||
static char * libraryName = N_("PulseAudio Sound");
|
||||
#else
|
||||
static char * libraryName = N_("NULL Sound");
|
||||
static char * libraryName = N_("SDL Sound");
|
||||
#endif
|
||||
|
||||
static char * libraryInfo = N_("P.E.Op.S. OSS Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n");
|
||||
static char * libraryInfo = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n");
|
||||
|
||||
// globals
|
||||
|
||||
|
|
|
@ -110,8 +110,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -191,8 +189,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
|
@ -102,8 +102,6 @@ ETAGS = etags
|
|||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
|
@ -183,8 +181,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PEOPSXGL = @PEOPSXGL@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
POSUB = @POSUB@
|
||||
PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
|
||||
PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_CONFIG = @SDL_CONFIG@
|
||||
|
|
69
po/it.po
69
po/it.po
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: pcsxr 1.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-05-14 10:55+0800\n"
|
||||
"POT-Creation-Date: 2010-05-19 16:31+0800\n"
|
||||
"PO-Revision-Date: 2010-03-15 16:00+0200\n"
|
||||
"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
|
||||
"Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
|
||||
|
@ -1476,77 +1476,77 @@ msgstr "Questo file non sembra essere un file valido di PSX.\n"
|
|||
msgid "Error loading %s: %s"
|
||||
msgstr "Si è verificato un errore durante il caricamento di %s: %s"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:183
|
||||
#: ../libpcsxcore/plugins.c:185
|
||||
#, c-format
|
||||
msgid "Could not load GPU plugin %s!"
|
||||
msgstr "Impossibile caricare il plugin %s della GPU!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:254
|
||||
#: ../libpcsxcore/plugins.c:256
|
||||
#, c-format
|
||||
msgid "Could not load CD-ROM plugin %s!"
|
||||
msgstr "Impossibile caricare il plugin %s del CD-ROM!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:300
|
||||
#: ../libpcsxcore/plugins.c:302
|
||||
#, c-format
|
||||
msgid "Could not load SPU plugin %s!"
|
||||
msgstr "Impossibile caricare il plugin %s della SPU!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:437
|
||||
#: ../libpcsxcore/plugins.c:439
|
||||
#, c-format
|
||||
msgid "Could not load Controller 1 plugin %s!"
|
||||
msgstr "Impossibile caricare il plugin %s del controller 1!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:491
|
||||
#: ../libpcsxcore/plugins.c:493
|
||||
#, c-format
|
||||
msgid "Could not load Controller 2 plugin %s!"
|
||||
msgstr "Impossibile caricare il plugin %s del controller 2!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:534
|
||||
#: ../libpcsxcore/plugins.c:536
|
||||
#, c-format
|
||||
msgid "Could not load NetPlay plugin %s!"
|
||||
msgstr "Impossibile caricare il plugin %s di NetPlay!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:595
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#, c-format
|
||||
msgid "Error initializing CD-ROM plugin: %d"
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante l'inizializzazione del plugin del CD-ROM: %"
|
||||
"d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#, c-format
|
||||
msgid "Error initializing GPU plugin: %d"
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante l'inizializzazione del plugin della GPU: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#, c-format
|
||||
msgid "Error initializing SPU plugin: %d"
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante l'inizializzazione del plugin della SPU: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 1 plugin: %d"
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante l'inizializzazione del plugin del "
|
||||
"controller 1: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#: ../libpcsxcore/plugins.c:605
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 2 plugin: %d"
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante l'inizializzazione del plugin del "
|
||||
"controller 2: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:607
|
||||
#: ../libpcsxcore/plugins.c:609
|
||||
#, c-format
|
||||
msgid "Error initializing NetPlay plugin: %d"
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante l'inizializzazione del plugin di NetPlay: %"
|
||||
"d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:610
|
||||
#: ../libpcsxcore/plugins.c:612
|
||||
msgid "Plugins loaded.\n"
|
||||
msgstr "Plugin caricati.\n"
|
||||
|
||||
|
@ -1579,28 +1579,28 @@ msgstr "Impossibile aprire il BIOS:\"%s\". Sto abilitando il bios HLE!\n"
|
|||
msgid "Running PCSX Version %s (%s).\n"
|
||||
msgstr "Avvio in corso di PCSX versione %s (%s).\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:344
|
||||
#: ../libpcsxcore/sio.c:345
|
||||
msgid "Connection closed!\n"
|
||||
msgstr "Connessione chiusa!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:370
|
||||
#: ../libpcsxcore/sio.c:371
|
||||
#, c-format
|
||||
msgid "No memory card value was specified - creating a default card %s\n"
|
||||
msgstr ""
|
||||
"Nessun valore specificato per la memory card, sto creando una card di "
|
||||
"default %s\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:374
|
||||
#: ../libpcsxcore/sio.c:375
|
||||
#, c-format
|
||||
msgid "The memory card %s doesn't exist - creating it\n"
|
||||
msgstr "La memory card %s non esiste, la sto creando\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:390
|
||||
#: ../libpcsxcore/sio.c:391
|
||||
#, c-format
|
||||
msgid "Memory card %s failed to load!\n"
|
||||
msgstr "Impossibile caricare la memory card %s!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:394
|
||||
#: ../libpcsxcore/sio.c:395
|
||||
#, c-format
|
||||
msgid "Loading memory card %s\n"
|
||||
msgstr "Sto caricando la memory card %s\n"
|
||||
|
@ -2222,28 +2222,18 @@ msgid "Patch Memory..."
|
|||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:38
|
||||
msgid "ALSA Sound"
|
||||
msgstr "Audio ALSA"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "Mac OS X Sound"
|
||||
msgstr "Audio Mac OS X"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:42
|
||||
msgid "OSS Sound"
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
#, fuzzy
|
||||
msgid "SDL Sound"
|
||||
msgstr "Audio OSS"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:44
|
||||
msgid "PulseAudio Sound"
|
||||
msgstr "Audio PulseAudio"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:46
|
||||
msgid "NULL Sound"
|
||||
msgstr "Senza audio"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:49
|
||||
#: ../plugins/dfsound/spu.c:43
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
"P.E.Op.S. Sound Driver V1.7\n"
|
||||
"Coded by Pete Bernert and the P.E.Op.S. team\n"
|
||||
msgstr ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
|
@ -3067,6 +3057,15 @@ msgstr "Tasto Start"
|
|||
msgid "Play Offline"
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "ALSA Sound"
|
||||
#~ msgstr "Audio ALSA"
|
||||
|
||||
#~ msgid "PulseAudio Sound"
|
||||
#~ msgstr "Audio PulseAudio"
|
||||
|
||||
#~ msgid "NULL Sound"
|
||||
#~ msgstr "Senza audio"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "Dump Memory..."
|
||||
#~ msgstr "&Memory card..."
|
||||
|
|
58
po/pcsx.pot
58
po/pcsx.pot
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-05-14 11:04+0800\n"
|
||||
"POT-Creation-Date: 2010-05-19 16:31+0800\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
@ -1410,67 +1410,67 @@ msgstr ""
|
|||
msgid "Error loading %s: %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:183
|
||||
#: ../libpcsxcore/plugins.c:185
|
||||
#, c-format
|
||||
msgid "Could not load GPU plugin %s!"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:254
|
||||
#: ../libpcsxcore/plugins.c:256
|
||||
#, c-format
|
||||
msgid "Could not load CD-ROM plugin %s!"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:300
|
||||
#: ../libpcsxcore/plugins.c:302
|
||||
#, c-format
|
||||
msgid "Could not load SPU plugin %s!"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:437
|
||||
#: ../libpcsxcore/plugins.c:439
|
||||
#, c-format
|
||||
msgid "Could not load Controller 1 plugin %s!"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:491
|
||||
#: ../libpcsxcore/plugins.c:493
|
||||
#, c-format
|
||||
msgid "Could not load Controller 2 plugin %s!"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:534
|
||||
#: ../libpcsxcore/plugins.c:536
|
||||
#, c-format
|
||||
msgid "Could not load NetPlay plugin %s!"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:595
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#, c-format
|
||||
msgid "Error initializing CD-ROM plugin: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#, c-format
|
||||
msgid "Error initializing GPU plugin: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#, c-format
|
||||
msgid "Error initializing SPU plugin: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 1 plugin: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#: ../libpcsxcore/plugins.c:605
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 2 plugin: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:607
|
||||
#: ../libpcsxcore/plugins.c:609
|
||||
#, c-format
|
||||
msgid "Error initializing NetPlay plugin: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:610
|
||||
#: ../libpcsxcore/plugins.c:612
|
||||
msgid "Plugins loaded.\n"
|
||||
msgstr ""
|
||||
|
||||
|
@ -1503,26 +1503,26 @@ msgstr ""
|
|||
msgid "Running PCSX Version %s (%s).\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/sio.c:344
|
||||
#: ../libpcsxcore/sio.c:345
|
||||
msgid "Connection closed!\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/sio.c:370
|
||||
#: ../libpcsxcore/sio.c:371
|
||||
#, c-format
|
||||
msgid "No memory card value was specified - creating a default card %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/sio.c:374
|
||||
#: ../libpcsxcore/sio.c:375
|
||||
#, c-format
|
||||
msgid "The memory card %s doesn't exist - creating it\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/sio.c:390
|
||||
#: ../libpcsxcore/sio.c:391
|
||||
#, c-format
|
||||
msgid "Memory card %s failed to load!\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../libpcsxcore/sio.c:394
|
||||
#: ../libpcsxcore/sio.c:395
|
||||
#, c-format
|
||||
msgid "Loading memory card %s\n"
|
||||
msgstr ""
|
||||
|
@ -2106,28 +2106,16 @@ msgid "Patch Memory..."
|
|||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:38
|
||||
msgid "ALSA Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "Mac OS X Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:42
|
||||
msgid "OSS Sound"
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "SDL Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:44
|
||||
msgid "PulseAudio Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:46
|
||||
msgid "NULL Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:49
|
||||
#: ../plugins/dfsound/spu.c:43
|
||||
msgid ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
"P.E.Op.S. Sound Driver V1.7\n"
|
||||
"Coded by Pete Bernert and the P.E.Op.S. team\n"
|
||||
msgstr ""
|
||||
|
||||
|
|
66
po/pt_BR.po
66
po/pt_BR.po
|
@ -5,7 +5,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: pcsx-df\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-05-14 10:55+0800\n"
|
||||
"POT-Creation-Date: 2010-05-19 16:31+0800\n"
|
||||
"PO-Revision-Date: 2009-11-28 23:57+0700\n"
|
||||
"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
|
||||
"Language-Team: PoBRE <romhackers@gmail.com>\n"
|
||||
|
@ -1462,67 +1462,67 @@ msgstr "Esse arquivo não parece ser um arquivo válido de PSX!\n"
|
|||
msgid "Error loading %s: %s"
|
||||
msgstr "Erro carregando \"%s\": \"%s\""
|
||||
|
||||
#: ../libpcsxcore/plugins.c:183
|
||||
#: ../libpcsxcore/plugins.c:185
|
||||
#, c-format
|
||||
msgid "Could not load GPU plugin %s!"
|
||||
msgstr "Não conseguiu carregar a extensão de GPU \"%s\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:254
|
||||
#: ../libpcsxcore/plugins.c:256
|
||||
#, c-format
|
||||
msgid "Could not load CD-ROM plugin %s!"
|
||||
msgstr "Não conseguiu carregar a extensão de CD-ROM \"%s\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:300
|
||||
#: ../libpcsxcore/plugins.c:302
|
||||
#, c-format
|
||||
msgid "Could not load SPU plugin %s!"
|
||||
msgstr "Não conseguiu carregar a extensão de SPU \"%s\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:437
|
||||
#: ../libpcsxcore/plugins.c:439
|
||||
#, c-format
|
||||
msgid "Could not load Controller 1 plugin %s!"
|
||||
msgstr "Não conseguiu carregar a extensão do Controle 1 \"%s\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:491
|
||||
#: ../libpcsxcore/plugins.c:493
|
||||
#, c-format
|
||||
msgid "Could not load Controller 2 plugin %s!"
|
||||
msgstr "Não conseguiu carregar a extensão do Controle 2 \"%s\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:534
|
||||
#: ../libpcsxcore/plugins.c:536
|
||||
#, c-format
|
||||
msgid "Could not load NetPlay plugin %s!"
|
||||
msgstr "Não conseguiu carregar a extensão de jogo em rede \"%s\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:595
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#, c-format
|
||||
msgid "Error initializing CD-ROM plugin: %d"
|
||||
msgstr "Erro ao iniciar a extensão de CD-ROM \"%d\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#, c-format
|
||||
msgid "Error initializing GPU plugin: %d"
|
||||
msgstr "Erro ao iniciar a extensão de GPU \"%d\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#, c-format
|
||||
msgid "Error initializing SPU plugin: %d"
|
||||
msgstr "Erro ao iniciar a extensão de SPU \"%d\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 1 plugin: %d"
|
||||
msgstr "Erro ao iniciar a extensão do Controle 1 \"%d\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#: ../libpcsxcore/plugins.c:605
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 2 plugin: %d"
|
||||
msgstr "Erro ao iniciar a extensão do Controle 2 \"%d\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:607
|
||||
#: ../libpcsxcore/plugins.c:609
|
||||
#, c-format
|
||||
msgid "Error initializing NetPlay plugin: %d"
|
||||
msgstr "Erro ao iniciar a extensão de jogo em rede \"%d\"!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:610
|
||||
#: ../libpcsxcore/plugins.c:612
|
||||
msgid "Plugins loaded.\n"
|
||||
msgstr "Extensões carregadas.\n"
|
||||
|
||||
|
@ -1555,26 +1555,26 @@ msgstr "Não conseguiu abrir a BIOS\"%s\". Usando BIOS HLE!\n"
|
|||
msgid "Running PCSX Version %s (%s).\n"
|
||||
msgstr "Rodando o PCSX Versão %s (%s).\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:344
|
||||
#: ../libpcsxcore/sio.c:345
|
||||
msgid "Connection closed!\n"
|
||||
msgstr "Conexão encerrada!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:370
|
||||
#: ../libpcsxcore/sio.c:371
|
||||
#, c-format
|
||||
msgid "No memory card value was specified - creating a default card %s\n"
|
||||
msgstr "Nenhum cartão de memória foi especificado, criando um \"%s\" padrão.\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:374
|
||||
#: ../libpcsxcore/sio.c:375
|
||||
#, c-format
|
||||
msgid "The memory card %s doesn't exist - creating it\n"
|
||||
msgstr "O cartão de memória \"%s\" não existe, será criado.\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:390
|
||||
#: ../libpcsxcore/sio.c:391
|
||||
#, c-format
|
||||
msgid "Memory card %s failed to load!\n"
|
||||
msgstr "Cartão de memória \"%s\" falhou para carregar!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:394
|
||||
#: ../libpcsxcore/sio.c:395
|
||||
#, c-format
|
||||
msgid "Loading memory card %s\n"
|
||||
msgstr "Carregando cartão de memória \"%s\".\n"
|
||||
|
@ -2194,28 +2194,18 @@ msgid "Patch Memory..."
|
|||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:38
|
||||
msgid "ALSA Sound"
|
||||
msgstr "Sistema ALSA"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "Mac OS X Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:42
|
||||
msgid "OSS Sound"
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
#, fuzzy
|
||||
msgid "SDL Sound"
|
||||
msgstr "Sistema OSS"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:44
|
||||
msgid "PulseAudio Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:46
|
||||
msgid "NULL Sound"
|
||||
msgstr "Sem som"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:49
|
||||
#: ../plugins/dfsound/spu.c:43
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
"P.E.Op.S. Sound Driver V1.7\n"
|
||||
"Coded by Pete Bernert and the P.E.Op.S. team\n"
|
||||
msgstr ""
|
||||
"Extensão OSS P.E.Op.S. V1.7\n"
|
||||
|
@ -3018,6 +3008,12 @@ msgstr ""
|
|||
msgid "Play Offline"
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "ALSA Sound"
|
||||
#~ msgstr "Sistema ALSA"
|
||||
|
||||
#~ msgid "NULL Sound"
|
||||
#~ msgstr "Sem som"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "Dump Memory..."
|
||||
#~ msgstr "&Cartões de memória..."
|
||||
|
|
77
po/ru_RU.po
77
po/ru_RU.po
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: pcsxr 1.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-05-14 10:55+0800\n"
|
||||
"POT-Creation-Date: 2010-05-19 16:31+0800\n"
|
||||
"PO-Revision-Date: 2010-05-14 06:01+0400\n"
|
||||
"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
|
||||
"Language-Team: American English <kde-i18n-doc@kde.org>\n"
|
||||
|
@ -387,7 +387,8 @@ msgid "NetPlay"
|
|||
msgstr "Сетевая игра"
|
||||
|
||||
#: ../win32/gui/ConfigurePlugins.c:620
|
||||
msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
|
||||
msgid ""
|
||||
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
|
||||
msgstr ""
|
||||
"Внимание! NetPlay плагин должен находится в том же каталоге что и остальные "
|
||||
"плагины."
|
||||
|
@ -1272,7 +1273,8 @@ msgstr "Отформатировать карту памяти?"
|
|||
msgid ""
|
||||
"If you format the memory card, the card will be empty, and any existing data "
|
||||
"overwritten."
|
||||
msgstr "При форматировании все данные на карте памяти будут безвозвратно утеряны."
|
||||
msgstr ""
|
||||
"При форматировании все данные на карте памяти будут безвозвратно утеряны."
|
||||
|
||||
#: ../gui/MemcardDlg.c:363
|
||||
msgid "Format card"
|
||||
|
@ -1428,67 +1430,67 @@ msgstr "This file does not appear to be a valid PSX file.\n"
|
|||
msgid "Error loading %s: %s"
|
||||
msgstr "Ошибка загрузки %s: %s"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:183
|
||||
#: ../libpcsxcore/plugins.c:185
|
||||
#, c-format
|
||||
msgid "Could not load GPU plugin %s!"
|
||||
msgstr "Не удалось загрузить GPU плагин %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:254
|
||||
#: ../libpcsxcore/plugins.c:256
|
||||
#, c-format
|
||||
msgid "Could not load CD-ROM plugin %s!"
|
||||
msgstr "Не удалось загрузить CD-ROM плагин %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:300
|
||||
#: ../libpcsxcore/plugins.c:302
|
||||
#, c-format
|
||||
msgid "Could not load SPU plugin %s!"
|
||||
msgstr "Не удалось загрузить SPU плагин %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:437
|
||||
#: ../libpcsxcore/plugins.c:439
|
||||
#, c-format
|
||||
msgid "Could not load Controller 1 plugin %s!"
|
||||
msgstr "Не удалось загрузить PAD1 плагин %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:491
|
||||
#: ../libpcsxcore/plugins.c:493
|
||||
#, c-format
|
||||
msgid "Could not load Controller 2 plugin %s!"
|
||||
msgstr "Не удалось загрузить PAD2 плагин %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:534
|
||||
#: ../libpcsxcore/plugins.c:536
|
||||
#, c-format
|
||||
msgid "Could not load NetPlay plugin %s!"
|
||||
msgstr "Не удалось загрузить NetPlay плагин %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:595
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#, c-format
|
||||
msgid "Error initializing CD-ROM plugin: %d"
|
||||
msgstr "Ошибка инициализации CD-ROM плагина: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#, c-format
|
||||
msgid "Error initializing GPU plugin: %d"
|
||||
msgstr "Ошибка инициализации GPU плагина: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#, c-format
|
||||
msgid "Error initializing SPU plugin: %d"
|
||||
msgstr "Ошибка инициализации SPU плагина: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 1 plugin: %d"
|
||||
msgstr "Ошибка инициализации PAD1 плагина: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#: ../libpcsxcore/plugins.c:605
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 2 plugin: %d"
|
||||
msgstr "Ошибка инициализации PAD2 плагина: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:607
|
||||
#: ../libpcsxcore/plugins.c:609
|
||||
#, c-format
|
||||
msgid "Error initializing NetPlay plugin: %d"
|
||||
msgstr "Ошибка инициализации NetPlay плагина: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:610
|
||||
#: ../libpcsxcore/plugins.c:612
|
||||
msgid "Plugins loaded.\n"
|
||||
msgstr "Плагины загружены.\n"
|
||||
|
||||
|
@ -1521,26 +1523,26 @@ msgstr "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
|
|||
msgid "Running PCSX Version %s (%s).\n"
|
||||
msgstr "Запуск PCSX версии %s (%s) 執行中。\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:344
|
||||
#: ../libpcsxcore/sio.c:345
|
||||
msgid "Connection closed!\n"
|
||||
msgstr "Соединение закрыто!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:370
|
||||
#: ../libpcsxcore/sio.c:371
|
||||
#, c-format
|
||||
msgid "No memory card value was specified - creating a default card %s\n"
|
||||
msgstr "Карта памяти не указана - создана новая карта %s\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:374
|
||||
#: ../libpcsxcore/sio.c:375
|
||||
#, c-format
|
||||
msgid "The memory card %s doesn't exist - creating it\n"
|
||||
msgstr "Карта памяти %s не существует - создана новая\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:390
|
||||
#: ../libpcsxcore/sio.c:391
|
||||
#, c-format
|
||||
msgid "Memory card %s failed to load!\n"
|
||||
msgstr "Ошибка загрузки карты памяти %s!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:394
|
||||
#: ../libpcsxcore/sio.c:395
|
||||
#, c-format
|
||||
msgid "Loading memory card %s\n"
|
||||
msgstr "Загрузка карты памяти %s\n"
|
||||
|
@ -1657,7 +1659,8 @@ msgstr "Авто-определение FPS"
|
|||
|
||||
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
|
||||
msgid "Enable this if games display too quickly."
|
||||
msgstr "Следует включить для автоматического определения и ограничения скорости игры."
|
||||
msgstr ""
|
||||
"Следует включить для автоматического определения и ограничения скорости игры."
|
||||
|
||||
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
|
||||
msgid "Enable frame skipping"
|
||||
|
@ -2149,28 +2152,17 @@ msgid "Patch Memory..."
|
|||
msgstr "Патч памяти..."
|
||||
|
||||
#: ../plugins/dfsound/spu.c:38
|
||||
msgid "ALSA Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "Mac OS X Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:42
|
||||
msgid "OSS Sound"
|
||||
msgstr ""
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
#, fuzzy
|
||||
msgid "SDL Sound"
|
||||
msgstr "Звук"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:44
|
||||
msgid "PulseAudio Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:46
|
||||
msgid "NULL Sound"
|
||||
msgstr ""
|
||||
|
||||
#: ../plugins/dfsound/spu.c:49
|
||||
#: ../plugins/dfsound/spu.c:43
|
||||
msgid ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
"P.E.Op.S. Sound Driver V1.7\n"
|
||||
"Coded by Pete Bernert and the P.E.Op.S. team\n"
|
||||
msgstr ""
|
||||
|
||||
|
@ -2275,7 +2267,8 @@ msgstr "Настройка CDR"
|
|||
|
||||
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
|
||||
msgid "Choose your CD-ROM device or type its path if it's not listed"
|
||||
msgstr "Выберите CD-привод или введите свой путь, если устройства нету в списке"
|
||||
msgstr ""
|
||||
"Выберите CD-привод или введите свой путь, если устройства нету в списке"
|
||||
|
||||
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
|
||||
msgid "Select CD-ROM device"
|
||||
|
@ -2979,7 +2972,8 @@ msgid "Client (Player2)"
|
|||
msgstr "Клиент (Игрок 2)"
|
||||
|
||||
#: ../plugins/dfnet/dfnet.glade2:130
|
||||
msgid "Do not change if not necessary (remember it must be changed on both sides)."
|
||||
msgid ""
|
||||
"Do not change if not necessary (remember it must be changed on both sides)."
|
||||
msgstr ""
|
||||
"Не меняйте без особой необходимости (помните что порты должны быть одинаковы "
|
||||
"для обеих сторон)"
|
||||
|
@ -2995,4 +2989,3 @@ msgstr "Начать сетевую игру"
|
|||
#: ../plugins/dfnet/dfnet.glade2:240
|
||||
msgid "Play Offline"
|
||||
msgstr "Начать без использования сети"
|
||||
|
||||
|
|
71
po/zh_CN.po
71
po/zh_CN.po
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: pcsxr 1.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-05-14 11:03+0800\n"
|
||||
"PO-Revision-Date: 2010-05-14 11:04+0800\n"
|
||||
"POT-Creation-Date: 2010-05-19 16:31+0800\n"
|
||||
"PO-Revision-Date: 2010-05-19 16:31+0800\n"
|
||||
"Last-Translator: Wei Mingzhi <whistler_wmz@users.sourceforge.net>\n"
|
||||
"Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
@ -1539,67 +1539,67 @@ msgstr "此文件不是一个合法的 PSX 文件。\n"
|
|||
msgid "Error loading %s: %s"
|
||||
msgstr "无法加载 %s: %s"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:183
|
||||
#: ../libpcsxcore/plugins.c:185
|
||||
#, c-format
|
||||
msgid "Could not load GPU plugin %s!"
|
||||
msgstr "无法加载 GPU 插件 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:254
|
||||
#: ../libpcsxcore/plugins.c:256
|
||||
#, c-format
|
||||
msgid "Could not load CD-ROM plugin %s!"
|
||||
msgstr "无法加载 CD-ROM 插件 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:300
|
||||
#: ../libpcsxcore/plugins.c:302
|
||||
#, c-format
|
||||
msgid "Could not load SPU plugin %s!"
|
||||
msgstr "无法加载 SPU 插件 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:437
|
||||
#: ../libpcsxcore/plugins.c:439
|
||||
#, c-format
|
||||
msgid "Could not load Controller 1 plugin %s!"
|
||||
msgstr "无法加载 \"控制器1\" 插件 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:491
|
||||
#: ../libpcsxcore/plugins.c:493
|
||||
#, c-format
|
||||
msgid "Could not load Controller 2 plugin %s!"
|
||||
msgstr "无法加载 \"控制器2\" 插件 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:534
|
||||
#: ../libpcsxcore/plugins.c:536
|
||||
#, c-format
|
||||
msgid "Could not load NetPlay plugin %s!"
|
||||
msgstr "无法加载联网游戏插件 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:595
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#, c-format
|
||||
msgid "Error initializing CD-ROM plugin: %d"
|
||||
msgstr "CD-ROM 插件初始化错误: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#, c-format
|
||||
msgid "Error initializing GPU plugin: %d"
|
||||
msgstr "GPU 插件初始化错误: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#, c-format
|
||||
msgid "Error initializing SPU plugin: %d"
|
||||
msgstr "SPU 插件初始化错误: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 1 plugin: %d"
|
||||
msgstr "\"控制器1\" 插件初始化错误: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#: ../libpcsxcore/plugins.c:605
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 2 plugin: %d"
|
||||
msgstr "\"控制器2\" 插件初始化错误: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:607
|
||||
#: ../libpcsxcore/plugins.c:609
|
||||
#, c-format
|
||||
msgid "Error initializing NetPlay plugin: %d"
|
||||
msgstr "联网游戏插件初始化错误: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:610
|
||||
#: ../libpcsxcore/plugins.c:612
|
||||
msgid "Plugins loaded.\n"
|
||||
msgstr "插件已加载。\n"
|
||||
|
||||
|
@ -1632,26 +1632,26 @@ msgstr "无法打开 BIOS: \"%s\"。使用内部 HLE Bios。\n"
|
|||
msgid "Running PCSX Version %s (%s).\n"
|
||||
msgstr "正在运行 PCSX 版本 %s (%s)。\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:344
|
||||
#: ../libpcsxcore/sio.c:345
|
||||
msgid "Connection closed!\n"
|
||||
msgstr "连接被关闭!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:370
|
||||
#: ../libpcsxcore/sio.c:371
|
||||
#, c-format
|
||||
msgid "No memory card value was specified - creating a default card %s\n"
|
||||
msgstr "未指定记忆卡 - 创建一个默认的记忆卡 %s\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:374
|
||||
#: ../libpcsxcore/sio.c:375
|
||||
#, c-format
|
||||
msgid "The memory card %s doesn't exist - creating it\n"
|
||||
msgstr "记忆卡 %s 不存在 - 正在创建\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:390
|
||||
#: ../libpcsxcore/sio.c:391
|
||||
#, c-format
|
||||
msgid "Memory card %s failed to load!\n"
|
||||
msgstr "记忆卡 %s 读取失败!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:394
|
||||
#: ../libpcsxcore/sio.c:395
|
||||
#, c-format
|
||||
msgid "Loading memory card %s\n"
|
||||
msgstr "加载记忆卡 %s\n"
|
||||
|
@ -2287,31 +2287,19 @@ msgid "Patch Memory..."
|
|||
msgstr "修改内存..."
|
||||
|
||||
#: ../plugins/dfsound/spu.c:38
|
||||
msgid "ALSA Sound"
|
||||
msgstr "ALSA 声音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "Mac OS X Sound"
|
||||
msgstr "Mac OS X 声音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:42
|
||||
msgid "OSS Sound"
|
||||
msgstr "OSS 声音"
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "SDL Sound"
|
||||
msgstr "SDL 声音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:44
|
||||
msgid "PulseAudio Sound"
|
||||
msgstr "PulseAudio 声音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:46
|
||||
msgid "NULL Sound"
|
||||
msgstr "空声音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:49
|
||||
#: ../plugins/dfsound/spu.c:43
|
||||
msgid ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
"P.E.Op.S. Sound Driver V1.7\n"
|
||||
"Coded by Pete Bernert and the P.E.Op.S. team\n"
|
||||
msgstr ""
|
||||
"P.E.Op.S OSS 驱动程序 V1.7\n"
|
||||
"P.E.Op.S 声音驱动程序 V1.7\n"
|
||||
"编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
|
||||
|
||||
#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
|
||||
|
@ -3151,3 +3139,10 @@ msgstr "开始游戏"
|
|||
msgid "Play Offline"
|
||||
msgstr "离线运行"
|
||||
|
||||
#~ msgid "ALSA Sound"
|
||||
#~ msgstr "ALSA 声音"
|
||||
#~ msgid "PulseAudio Sound"
|
||||
#~ msgstr "PulseAudio 声音"
|
||||
#~ msgid "NULL Sound"
|
||||
#~ msgstr "空声音"
|
||||
|
||||
|
|
71
po/zh_TW.po
71
po/zh_TW.po
|
@ -7,8 +7,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: pcsxr 1.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-05-14 11:03+0800\n"
|
||||
"PO-Revision-Date: 2010-05-14 11:04+0800\n"
|
||||
"POT-Creation-Date: 2010-05-19 16:31+0800\n"
|
||||
"PO-Revision-Date: 2010-05-19 16:32+0800\n"
|
||||
"Last-Translator: Wei Mingzhi <whistler_wmz@users.sourceforge.net>\n"
|
||||
"Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
@ -1539,67 +1539,67 @@ msgstr "此檔案不是一個合法的 PSX 檔案。\n"
|
|||
msgid "Error loading %s: %s"
|
||||
msgstr "無法加載 %s: %s"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:183
|
||||
#: ../libpcsxcore/plugins.c:185
|
||||
#, c-format
|
||||
msgid "Could not load GPU plugin %s!"
|
||||
msgstr "無法加載 GPU 外掛 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:254
|
||||
#: ../libpcsxcore/plugins.c:256
|
||||
#, c-format
|
||||
msgid "Could not load CD-ROM plugin %s!"
|
||||
msgstr "無法加載 CD-ROM 外掛 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:300
|
||||
#: ../libpcsxcore/plugins.c:302
|
||||
#, c-format
|
||||
msgid "Could not load SPU plugin %s!"
|
||||
msgstr "無法加載 SPU 外掛 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:437
|
||||
#: ../libpcsxcore/plugins.c:439
|
||||
#, c-format
|
||||
msgid "Could not load Controller 1 plugin %s!"
|
||||
msgstr "無法加載 \"控制器1\" 外掛 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:491
|
||||
#: ../libpcsxcore/plugins.c:493
|
||||
#, c-format
|
||||
msgid "Could not load Controller 2 plugin %s!"
|
||||
msgstr "無法加載 \"控制器2\" 外掛 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:534
|
||||
#: ../libpcsxcore/plugins.c:536
|
||||
#, c-format
|
||||
msgid "Could not load NetPlay plugin %s!"
|
||||
msgstr "無法加載聯網遊戲外掛 %s!"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:595
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#, c-format
|
||||
msgid "Error initializing CD-ROM plugin: %d"
|
||||
msgstr "CD-ROM 外掛初始化錯誤: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:597
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#, c-format
|
||||
msgid "Error initializing GPU plugin: %d"
|
||||
msgstr "GPU 外掛初始化錯誤: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:599
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#, c-format
|
||||
msgid "Error initializing SPU plugin: %d"
|
||||
msgstr "SPU 外掛初始化錯誤: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:601
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 1 plugin: %d"
|
||||
msgstr "\"控制器1\" 外掛初始化錯誤: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:603
|
||||
#: ../libpcsxcore/plugins.c:605
|
||||
#, c-format
|
||||
msgid "Error initializing Controller 2 plugin: %d"
|
||||
msgstr "\"控制器2\" 外掛初始化錯誤: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:607
|
||||
#: ../libpcsxcore/plugins.c:609
|
||||
#, c-format
|
||||
msgid "Error initializing NetPlay plugin: %d"
|
||||
msgstr "聯網遊戲外掛初始化錯誤: %d"
|
||||
|
||||
#: ../libpcsxcore/plugins.c:610
|
||||
#: ../libpcsxcore/plugins.c:612
|
||||
msgid "Plugins loaded.\n"
|
||||
msgstr "外掛已加載。\n"
|
||||
|
||||
|
@ -1632,26 +1632,26 @@ msgstr "無法開啟 BIOS: \"%s\"。使用內部 HLE Bios。\n"
|
|||
msgid "Running PCSX Version %s (%s).\n"
|
||||
msgstr "PCSX 版本 %s (%s) 執行中。\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:344
|
||||
#: ../libpcsxcore/sio.c:345
|
||||
msgid "Connection closed!\n"
|
||||
msgstr "連接被關閉!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:370
|
||||
#: ../libpcsxcore/sio.c:371
|
||||
#, c-format
|
||||
msgid "No memory card value was specified - creating a default card %s\n"
|
||||
msgstr "未指定記憶卡 - 創建一個新的記憶卡 %s\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:374
|
||||
#: ../libpcsxcore/sio.c:375
|
||||
#, c-format
|
||||
msgid "The memory card %s doesn't exist - creating it\n"
|
||||
msgstr "記憶卡 %s 不存在 - 正在創建\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:390
|
||||
#: ../libpcsxcore/sio.c:391
|
||||
#, c-format
|
||||
msgid "Memory card %s failed to load!\n"
|
||||
msgstr "記憶卡 %s 讀取失敗!\n"
|
||||
|
||||
#: ../libpcsxcore/sio.c:394
|
||||
#: ../libpcsxcore/sio.c:395
|
||||
#, c-format
|
||||
msgid "Loading memory card %s\n"
|
||||
msgstr "正在加載記憶卡 %s\n"
|
||||
|
@ -2287,31 +2287,19 @@ msgid "Patch Memory..."
|
|||
msgstr "修改記憶體..."
|
||||
|
||||
#: ../plugins/dfsound/spu.c:38
|
||||
msgid "ALSA Sound"
|
||||
msgstr "ALSA 聲音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "Mac OS X Sound"
|
||||
msgstr "Mac OS X 聲音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:42
|
||||
msgid "OSS Sound"
|
||||
msgstr "OSS 聲音"
|
||||
#: ../plugins/dfsound/spu.c:40
|
||||
msgid "SDL Sound"
|
||||
msgstr "SDL 聲音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:44
|
||||
msgid "PulseAudio Sound"
|
||||
msgstr "PulseAudio 聲音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:46
|
||||
msgid "NULL Sound"
|
||||
msgstr "NULL 聲音"
|
||||
|
||||
#: ../plugins/dfsound/spu.c:49
|
||||
#: ../plugins/dfsound/spu.c:43
|
||||
msgid ""
|
||||
"P.E.Op.S. OSS Driver V1.7\n"
|
||||
"P.E.Op.S. Sound Driver V1.7\n"
|
||||
"Coded by Pete Bernert and the P.E.Op.S. team\n"
|
||||
msgstr ""
|
||||
"P.E.Op.S. OSS 驅動程式 V1.7\n"
|
||||
"P.E.Op.S. Sound 驅動程式 V1.7\n"
|
||||
"由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
|
||||
|
||||
#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
|
||||
|
@ -3151,3 +3139,10 @@ msgstr "開始遊戲"
|
|||
msgid "Play Offline"
|
||||
msgstr "離線遊戲"
|
||||
|
||||
#~ msgid "ALSA Sound"
|
||||
#~ msgstr "ALSA 聲音"
|
||||
#~ msgid "PulseAudio Sound"
|
||||
#~ msgstr "PulseAudio 聲音"
|
||||
#~ msgid "NULL Sound"
|
||||
#~ msgstr "NULL 聲音"
|
||||
|
||||
|
|
Loading…
Reference in New Issue