mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 00:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Jack pkgconf version.

Browse Source
This commit is contained in:
Themaister 2011-03-13 18:09:27 +01:00
parent 50d78fb804
commit c5942ec5a2
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -53,7 +53,8 @@ endif
endif endif
ifeq ($(HAVE_JACK),1) ifeq ($(HAVE_JACK),1)
OBJ += audio/jack.o OBJ += audio/jack.o
LIBS += -ljack LIBS += $(JACK_LIBS)
DEFINES += $(JACK_CFLAGS)
endif endif
ifeq ($(HAVE_PULSE), 1) ifeq ($(HAVE_PULSE), 1)
OBJ += audio/pulse.o OBJ += audio/pulse.o

20
gfx/xvideo.c
View File

@ -30,7 +30,7 @@
#include <X11/extensions/Xv.h> #include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h> #include <X11/extensions/Xvlib.h>
// Adapted from bSNES source. // Adapted from bSNES and MPlayer source.
typedef struct xv xv_t; typedef struct xv xv_t;
struct xv struct xv
@ -61,6 +61,15 @@ struct xv
void (*render_func)(xv_t*, const void *frame, unsigned width, unsigned height, unsigned pitch); void (*render_func)(xv_t*, const void *frame, unsigned width, unsigned height, unsigned pitch);
}; };
static void xv_set_nonblock_state(void *data, bool state)
{
xv_t *xv = data;
Atom atom = XInternAtom(xv->display, "XV_SYNC_TO_VBLANK", true);
if (atom != None && xv->port >= 0)
XvSetPortAttribute(xv->display, xv->port, atom, !state);
else
SSNES_WARN("Failed to set SYNC_TO_VBLANK attribute.\n");
}
static volatile sig_atomic_t g_quit = false; static volatile sig_atomic_t g_quit = false;
static void sighandler(int sig) static void sighandler(int sig)
@ -425,6 +434,8 @@ static void* xv_init(video_info_t *video, const input_driver_t **input, void **i
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL); sigaction(SIGTERM, &sa, NULL);
xv_set_nonblock_state(xv, !video->vsync);
void *xinput = input_x.init(); void *xinput = input_x.init();
if (xinput) if (xinput)
{ {
@ -568,13 +579,6 @@ static bool xv_focus(void *data)
return true; return true;
} }
static void xv_set_nonblock_state(void *data, bool state)
{
xv_t *xv = data;
Atom atom = XInternAtom(xv->display, "XV_SYNC_TO_VBLANK", true);
if (atom != None && xv->port >= 0)
XvSetPortAttribute(xv->display, xv->port, atom, !state);
}
static void xv_free(void *data) static void xv_free(void *data)
{ {

2
qb/config.libs.sh
View File

@ -28,7 +28,7 @@ fi
check_pkgconf RSOUND rsound 1.1 check_pkgconf RSOUND rsound 1.1
check_lib ROAR -lroar roar_vs_new check_lib ROAR -lroar roar_vs_new
check_lib JACK -ljack jack_client_open check_pkgconf JACK jack 0.120.1
check_pkgconf PULSE libpulse check_pkgconf PULSE libpulse
check_pkgconf SDL sdl 1.2.10 check_pkgconf SDL sdl 1.2.10