--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403645
This commit is contained in:
Sam Lantinga 2009-06-10 13:34:20 +00:00
parent e74bc6f89f
commit d03a7700eb
18 changed files with 616 additions and 704 deletions

View file

@ -11,56 +11,59 @@
#define AUDIO_USAGE \
"[--rate N] [--format U8|S8|U16|U16LE|U16BE|S16|S16LE|S16BE] [--channels N] [--samples N]"
struct pformat {
struct pformat
{
Uint32 id;
const char* idstr;
} pixel_format[]={
{SDL_PIXELFORMAT_INDEX1LSB, "SDL_PIXELFORMAT_INDEX1LSB"},
{SDL_PIXELFORMAT_INDEX1MSB, "SDL_PIXELFORMAT_INDEX1MSB"},
{SDL_PIXELFORMAT_INDEX4LSB, "SDL_PIXELFORMAT_INDEX4LSB"},
{SDL_PIXELFORMAT_INDEX4MSB, "SDL_PIXELFORMAT_INDEX4MSB"},
{SDL_PIXELFORMAT_INDEX8, "SDL_PIXELFORMAT_INDEX8"},
{SDL_PIXELFORMAT_RGB332, "SDL_PIXELFORMAT_RGB332"},
{SDL_PIXELFORMAT_RGB444, "SDL_PIXELFORMAT_RGB444"},
{SDL_PIXELFORMAT_RGB555, "SDL_PIXELFORMAT_RGB555"},
{SDL_PIXELFORMAT_BGR555, "SDL_PIXELFORMAT_BGR555"},
{SDL_PIXELFORMAT_ARGB4444, "SDL_PIXELFORMAT_ARGB4444"},
{SDL_PIXELFORMAT_ABGR4444, "SDL_PIXELFORMAT_ABGR4444"},
{SDL_PIXELFORMAT_ARGB1555, "SDL_PIXELFORMAT_ARGB1555"},
{SDL_PIXELFORMAT_ABGR1555, "SDL_PIXELFORMAT_ABGR1555"},
{SDL_PIXELFORMAT_RGB565, "SDL_PIXELFORMAT_RGB565"},
{SDL_PIXELFORMAT_BGR565, "SDL_PIXELFORMAT_BGR565"},
{SDL_PIXELFORMAT_RGB24, "SDL_PIXELFORMAT_RGB24"},
{SDL_PIXELFORMAT_BGR24, "SDL_PIXELFORMAT_BGR24"},
{SDL_PIXELFORMAT_RGB888, "SDL_PIXELFORMAT_RGB888"},
{SDL_PIXELFORMAT_BGR888, "SDL_PIXELFORMAT_BGR888"},
{SDL_PIXELFORMAT_ARGB8888, "SDL_PIXELFORMAT_ARGB8888"},
{SDL_PIXELFORMAT_RGBA8888, "SDL_PIXELFORMAT_RGBA8888"},
{SDL_PIXELFORMAT_ABGR8888, "SDL_PIXELFORMAT_ABGR8888"},
{SDL_PIXELFORMAT_BGRA8888, "SDL_PIXELFORMAT_BGRA8888"},
{SDL_PIXELFORMAT_ARGB2101010, "SDL_PIXELFORMAT_ARGB2101010"},
{SDL_PIXELFORMAT_YV12, "SDL_PIXELFORMAT_YV12"},
{SDL_PIXELFORMAT_IYUV, "SDL_PIXELFORMAT_IYUV"},
{SDL_PIXELFORMAT_YUY2, "SDL_PIXELFORMAT_YUY2"},
{SDL_PIXELFORMAT_UYVY, "SDL_PIXELFORMAT_UYVY"},
{SDL_PIXELFORMAT_YVYU, "SDL_PIXELFORMAT_YVYU"}
const char *idstr;
} pixel_format[] = {
{
SDL_PIXELFORMAT_INDEX1LSB, "SDL_PIXELFORMAT_INDEX1LSB"}, {
SDL_PIXELFORMAT_INDEX1MSB, "SDL_PIXELFORMAT_INDEX1MSB"}, {
SDL_PIXELFORMAT_INDEX4LSB, "SDL_PIXELFORMAT_INDEX4LSB"}, {
SDL_PIXELFORMAT_INDEX4MSB, "SDL_PIXELFORMAT_INDEX4MSB"}, {
SDL_PIXELFORMAT_INDEX8, "SDL_PIXELFORMAT_INDEX8"}, {
SDL_PIXELFORMAT_RGB332, "SDL_PIXELFORMAT_RGB332"}, {
SDL_PIXELFORMAT_RGB444, "SDL_PIXELFORMAT_RGB444"}, {
SDL_PIXELFORMAT_RGB555, "SDL_PIXELFORMAT_RGB555"}, {
SDL_PIXELFORMAT_BGR555, "SDL_PIXELFORMAT_BGR555"}, {
SDL_PIXELFORMAT_ARGB4444, "SDL_PIXELFORMAT_ARGB4444"}, {
SDL_PIXELFORMAT_ABGR4444, "SDL_PIXELFORMAT_ABGR4444"}, {
SDL_PIXELFORMAT_ARGB1555, "SDL_PIXELFORMAT_ARGB1555"}, {
SDL_PIXELFORMAT_ABGR1555, "SDL_PIXELFORMAT_ABGR1555"}, {
SDL_PIXELFORMAT_RGB565, "SDL_PIXELFORMAT_RGB565"}, {
SDL_PIXELFORMAT_BGR565, "SDL_PIXELFORMAT_BGR565"}, {
SDL_PIXELFORMAT_RGB24, "SDL_PIXELFORMAT_RGB24"}, {
SDL_PIXELFORMAT_BGR24, "SDL_PIXELFORMAT_BGR24"}, {
SDL_PIXELFORMAT_RGB888, "SDL_PIXELFORMAT_RGB888"}, {
SDL_PIXELFORMAT_BGR888, "SDL_PIXELFORMAT_BGR888"}, {
SDL_PIXELFORMAT_ARGB8888, "SDL_PIXELFORMAT_ARGB8888"}, {
SDL_PIXELFORMAT_RGBA8888, "SDL_PIXELFORMAT_RGBA8888"}, {
SDL_PIXELFORMAT_ABGR8888, "SDL_PIXELFORMAT_ABGR8888"}, {
SDL_PIXELFORMAT_BGRA8888, "SDL_PIXELFORMAT_BGRA8888"}, {
SDL_PIXELFORMAT_ARGB2101010, "SDL_PIXELFORMAT_ARGB2101010"}, {
SDL_PIXELFORMAT_YV12, "SDL_PIXELFORMAT_YV12"}, {
SDL_PIXELFORMAT_IYUV, "SDL_PIXELFORMAT_IYUV"}, {
SDL_PIXELFORMAT_YUY2, "SDL_PIXELFORMAT_YUY2"}, {
SDL_PIXELFORMAT_UYVY, "SDL_PIXELFORMAT_UYVY"}, {
SDL_PIXELFORMAT_YVYU, "SDL_PIXELFORMAT_YVYU"}
};
const char* PixelFormatToString(Uint32 pformat)
const char *
PixelFormatToString(Uint32 pformat)
{
Uint32 it=0;
Uint32 it = 0;
do {
if (pixel_format[it].idstr == NULL) {
break;
}
if (pixel_format[it].id == pformat) {
return pixel_format[it].idstr;
}
it++;
} while(1);
do {
if (pixel_format[it].idstr == NULL) {
break;
}
if (pixel_format[it].id == pformat) {
return pixel_format[it].idstr;
}
it++;
} while (1);
return "SDL_PIXELFORMAT_UNKNOWN";
return "SDL_PIXELFORMAT_UNKNOWN";
}
CommonState *
@ -706,7 +709,7 @@ CommonInit(CommonState * state)
fullscreen_mode.w = state->window_w;
fullscreen_mode.h = state->window_h;
fullscreen_mode.refresh_rate = state->refresh_rate;
if (SDL_SetFullscreenDisplayMode(&fullscreen_mode)<0) {
if (SDL_SetFullscreenDisplayMode(&fullscreen_mode) < 0) {
fprintf(stderr, "Can't switch to fullscreen display mode: %s\n",
SDL_GetError());
return SDL_FALSE;

View file

@ -1,64 +1,64 @@
#include "SDL.h"
int
main(int argc, char** argv)
main(int argc, char **argv)
{
int rv = 10;
volatile int atomic;
int rv = 10;
volatile int atomic;
SDL_atomic_int_set(&atomic, 10);
if(SDL_atomic_int_get(&atomic) != 10)
printf("Error: ");
printf("SDL_atomic_int_set(atomic, 10): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
SDL_atomic_int_add(&atomic, 10);
if(SDL_atomic_int_get(&atomic) != 20)
printf("Error: ");
printf("SDL_atomic_int_add(atomic, 10): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_cmp_xchg(&atomic, 20, 30);
if(rv != SDL_TRUE || SDL_atomic_int_get(&atomic) != 30)
printf("Error: ");
printf("SDL_atomic_int_cmp_xchg(atomic, 20, 30): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_cmp_xchg(&atomic, 20, 30);
if(rv != SDL_FALSE || SDL_atomic_int_get(&atomic) != 30)
printf("Error: ");
printf("SDL_atomic_int_cmp_xchg(atomic, 20, 40): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_xchg_add(&atomic, 10);
if(rv != 30 || SDL_atomic_int_get(&atomic) != 40)
printf("Error: ");
printf("SDL_atomic_int_xchg_add(atomic, 10): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
SDL_atomic_int_set(&atomic, 10);
if (SDL_atomic_int_get(&atomic) != 10)
printf("Error: ");
printf("SDL_atomic_int_set(atomic, 10): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
SDL_atomic_int_inc(&atomic);
if(SDL_atomic_int_get(&atomic) != 41)
printf("Error: ");
printf("SDL_atomic_int_inc(atomic): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
SDL_atomic_int_add(&atomic, 10);
if (SDL_atomic_int_get(&atomic) != 20)
printf("Error: ");
printf("SDL_atomic_int_add(atomic, 10): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_dec_test(&atomic);
if(rv != SDL_FALSE || SDL_atomic_int_get(&atomic) != 40)
printf("Error: ");
printf("SDL_atomic_int_dec_test(atomic): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
SDL_atomic_int_set(&atomic, 1);
if(SDL_atomic_int_get(&atomic) != 1)
printf("Error: ");
rv = SDL_atomic_int_cmp_xchg(&atomic, 20, 30);
if (rv != SDL_TRUE || SDL_atomic_int_get(&atomic) != 30)
printf("Error: ");
printf("SDL_atomic_int_cmp_xchg(atomic, 20, 30): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_cmp_xchg(&atomic, 20, 30);
if (rv != SDL_FALSE || SDL_atomic_int_get(&atomic) != 30)
printf("Error: ");
printf("SDL_atomic_int_cmp_xchg(atomic, 20, 40): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_xchg_add(&atomic, 10);
if (rv != 30 || SDL_atomic_int_get(&atomic) != 40)
printf("Error: ");
printf("SDL_atomic_int_xchg_add(atomic, 10): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
SDL_atomic_int_inc(&atomic);
if (SDL_atomic_int_get(&atomic) != 41)
printf("Error: ");
printf("SDL_atomic_int_inc(atomic): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_dec_test(&atomic);
if (rv != SDL_FALSE || SDL_atomic_int_get(&atomic) != 40)
printf("Error: ");
printf("SDL_atomic_int_dec_test(atomic): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
SDL_atomic_int_set(&atomic, 1);
if (SDL_atomic_int_get(&atomic) != 1)
printf("Error: ");
printf("SDL_atomic_int_set(atomic, 1): atomic-> %d\n",
SDL_atomic_int_get(&atomic));
rv = SDL_atomic_int_dec_test(&atomic);
if(rv != SDL_TRUE || SDL_atomic_int_get(&atomic) != 0)
printf("Error: ");
printf("SDL_atomic_int_dec_test(atomic): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
return 0;
rv = SDL_atomic_int_dec_test(&atomic);
if (rv != SDL_TRUE || SDL_atomic_int_get(&atomic) != 0)
printf("Error: ");
printf("SDL_atomic_int_dec_test(atomic): rv-> %d, atomic-> %d\n",
rv, SDL_atomic_int_get(&atomic));
return 0;
}

View file

@ -3,33 +3,33 @@
#include <stdio.h>
#include "SDL.h"
static void report_power(void)
static void
report_power(void)
{
int seconds, percent;
const SDL_PowerState state = SDL_GetPowerInfo(&seconds, &percent);
char *statestr = NULL;
printf("SDL-reported power info...\n");
switch(state)
{
case SDL_POWERSTATE_UNKNOWN:
statestr = "Unknown";
break;
case SDL_POWERSTATE_ON_BATTERY:
statestr = "On battery";
break;
case SDL_POWERSTATE_NO_BATTERY:
statestr = "No battery";
break;
case SDL_POWERSTATE_CHARGING:
statestr = "Charging";
break;
case SDL_POWERSTATE_CHARGED:
statestr = "Charged";
break;
default:
statestr = "!!API ERROR!!";
break;
switch (state) {
case SDL_POWERSTATE_UNKNOWN:
statestr = "Unknown";
break;
case SDL_POWERSTATE_ON_BATTERY:
statestr = "On battery";
break;
case SDL_POWERSTATE_NO_BATTERY:
statestr = "No battery";
break;
case SDL_POWERSTATE_CHARGING:
statestr = "Charging";
break;
case SDL_POWERSTATE_CHARGED:
statestr = "Charged";
break;
default:
statestr = "!!API ERROR!!";
break;
}
printf("State: %s\n", statestr);
@ -43,12 +43,14 @@ static void report_power(void)
if (seconds == -1) {
printf("Time left: unknown\n");
} else {
printf("Time left: %d minutes, %d seconds\n", (int) (seconds / 60), (int) (seconds % 60));
printf("Time left: %d minutes, %d seconds\n", (int) (seconds / 60),
(int) (seconds % 60));
}
}
int main(int argc, char *argv[])
int
main(int argc, char *argv[])
{
if (SDL_Init(SDL_INIT_VIDEO) == -1) {
fprintf(stderr, "SDL_Init() failed: %s\n", SDL_GetError());
@ -62,4 +64,3 @@ int main(int argc, char *argv[])
}
/* end of testpower.c ... */

View file

@ -61,13 +61,15 @@ LoadSprite(char *file)
} else {
switch (temp->format->BitsPerPixel) {
case 15:
SDL_SetColorKey(temp, SDL_SRCCOLORKEY, (*(Uint16 *) temp->pixels) & 0x00007FFF);
SDL_SetColorKey(temp, SDL_SRCCOLORKEY,
(*(Uint16 *) temp->pixels) & 0x00007FFF);
break;
case 16:
SDL_SetColorKey(temp, SDL_SRCCOLORKEY, *(Uint16 *) temp->pixels);
break;
case 24:
SDL_SetColorKey(temp, SDL_SRCCOLORKEY, (*(Uint32 *) temp->pixels) & 0x00FFFFFF);
SDL_SetColorKey(temp, SDL_SRCCOLORKEY,
(*(Uint32 *) temp->pixels) & 0x00FFFFFF);
break;
case 32:
SDL_SetColorKey(temp, SDL_SRCCOLORKEY, *(Uint32 *) temp->pixels);