From 6bf7c3cb0687612da8e10a56a9eee3441bf84a74 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 18 Oct 2012 06:06:55 +0200 Subject: [PATCH] Update credits for collaborated files --- 360/xdk360_audio.cpp | 1 + 360/xenon360_audio.c | 1 + 360/xenon360_video.c | 1 + AUTHORS | 2 ++ android/native/jni/input_android.c | 6 +++--- audio/dsound.c | 6 ++---- audio/opensl.c | 1 + gfx/gfx_common.c | 1 + gfx/gl.c | 1 + gx/frontend/main.c | 1 + gx/gx_video.h | 2 ++ gx/salamander/main.c | 1 + xbox1/image.c | 30 ++++++++++-------------------- xdk/xdk_resources.cpp | 1 + xdk/xdk_resources.h | 1 + 15 files changed, 29 insertions(+), 27 deletions(-) diff --git a/360/xdk360_audio.cpp b/360/xdk360_audio.cpp index 6d4fa51691..1e6d42a222 100644 --- a/360/xdk360_audio.cpp +++ b/360/xdk360_audio.cpp @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/360/xenon360_audio.c b/360/xenon360_audio.c index 11ad6ed2fd..c2d9b36be1 100644 --- a/360/xenon360_audio.c +++ b/360/xenon360_audio.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/360/xenon360_video.c b/360/xenon360_video.c index f1c0726904..db84d1673f 100644 --- a/360/xenon360_video.c +++ b/360/xenon360_video.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/AUTHORS b/AUTHORS index ad257527e6..6ee3f4ad98 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,8 @@ Daniel De Matteis - - XBox 360 XDK port - Libxenon port - XBox 1 port + - Android port (WIP) + - OpenSL ES audio driver (preliminary) - Gamecube/Wii libogc port David Reichelt - diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index 43abb341e3..1a21713abb 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- @@ -17,9 +18,8 @@ #include "../../../general.h" #include "../../../driver.h" -/** - * Process the next input event. - */ +/* Process the next input event */ + static int32_t engine_handle_input(struct android_app* app, AInputEvent* event) { if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) diff --git a/audio/dsound.c b/audio/dsound.c index fc43d7aa09..c5357e070a 100644 --- a/audio/dsound.c +++ b/audio/dsound.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- @@ -14,13 +15,10 @@ */ #ifdef _XBOX -// The buffer memory has been lost, and must be restored #define DSERR_BUFFERLOST MAKE_DSHRESULT(150) -// An invalid parameter was passed to the returning function #define DSERR_INVALIDPARAM E_INVALIDARG -// The caller does not have the priority level required for the function to -// succeed #define DSERR_PRIOLEVELNEEDED MAKE_DSHRESULT(70) + // Send the audio signal (stereo, without attenuation) to all existing speakers static DSMIXBINVOLUMEPAIR dsmbvp[8] = { { DSMIXBIN_FRONT_LEFT, DSBVOLUME_MAX }, diff --git a/audio/opensl.c b/audio/opensl.c index 322e4b680f..6e5b444ec2 100644 --- a/audio/opensl.c +++ b/audio/opensl.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/gfx/gfx_common.c b/gfx/gfx_common.c index 0ee9a1b45c..da1cb4470c 100644 --- a/gfx/gfx_common.c +++ b/gfx/gfx_common.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/gfx/gl.c b/gfx/gl.c index 7a722006cb..0e722620f9 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/gx/frontend/main.c b/gx/frontend/main.c index 6a25618de2..3df2eb08b3 100644 --- a/gx/frontend/main.c +++ b/gx/frontend/main.c @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * Copyright (C) 2012 - Michael Lelli * * RetroArch is free software: you can redistribute it and/or modify it under the terms diff --git a/gx/gx_video.h b/gx/gx_video.h index 7147ee8ad7..612b4b265a 100644 --- a/gx/gx_video.h +++ b/gx/gx_video.h @@ -1,5 +1,7 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis + * Copyright (C) 2012 - Michael Lelli * * RetroArch 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 Found- diff --git a/gx/salamander/main.c b/gx/salamander/main.c index 8dbe009eea..8fedb696e7 100644 --- a/gx/salamander/main.c +++ b/gx/salamander/main.c @@ -1,4 +1,5 @@ /* RetroArch - A frontend for libretro. + * RetroArch Salamander - A frontend for managing some pre-launch tasks. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen * Copyright (C) 2011-2012 - Daniel De Matteis * diff --git a/xbox1/image.c b/xbox1/image.c index 45c9b26001..87cf4ab132 100644 --- a/xbox1/image.c +++ b/xbox1/image.c @@ -26,20 +26,10 @@ bool texture_image_load(const char *path, struct texture_image *out_img) out_img->pixels = NULL; out_img->vertex_buf = NULL; - HRESULT ret = D3DXCreateTextureFromFileExA(d3d->d3d_render_device, // d3d device - path, // filename - D3DX_DEFAULT, // width - D3DX_DEFAULT, // height - D3DX_DEFAULT, // mipmaps - 0, // usage - D3DFMT_A8R8G8B8, // format - D3DPOOL_MANAGED, // memory class - D3DX_DEFAULT, // texture filter - D3DX_DEFAULT, // mipmapping - 0, // colorkey - &m_imageInfo, // image info - NULL, // palette - &out_img->pixels); // texture + HRESULT ret = D3DXCreateTextureFromFileExA(d3d->d3d_render_device, + path, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_A8R8G8B8, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, &m_imageInfo, NULL, + &out_img->pixels); if(FAILED(ret)) { @@ -96,14 +86,14 @@ bool texture_image_render(struct texture_image *out_img) float fX = static_cast(x); float fY = static_cast(y); - // create the new vertices + // create the new vertices DrawVerticeFormats newVerts[] = { - // x, y, z, color, u ,v - {fX, fY, 0.0f, 0, 0, 0}, - {fX + w, fY, 0.0f, 0, 1, 0}, - {fX + w, fY + h, 0.0f, 0, 1, 1}, - {fX, fY + h, 0.0f, 0, 0, 1} + // x, y, z, color, u ,v + {fX, fY, 0.0f, 0, 0, 0}, + {fX + w, fY, 0.0f, 0, 1, 0}, + {fX + w, fY + h, 0.0f, 0, 1, 1}, + {fX, fY + h, 0.0f, 0, 0, 1} }; // load the existing vertices diff --git a/xdk/xdk_resources.cpp b/xdk/xdk_resources.cpp index 7df3a4902e..f4afda6d10 100644 --- a/xdk/xdk_resources.cpp +++ b/xdk/xdk_resources.cpp @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found- diff --git a/xdk/xdk_resources.h b/xdk/xdk_resources.h index cdfa001b7d..dd1e5cabb9 100644 --- a/xdk/xdk_resources.h +++ b/xdk/xdk_resources.h @@ -1,5 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis * * RetroArch 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 Found-