From 055edad27bd6b8f0f1115b040021bf4486721df7 Mon Sep 17 00:00:00 2001 From: enselic Date: Tue, 16 Sep 2008 20:09:03 +0000 Subject: src/rmd_macro.h: Move the DEFAULT_AUDIO_DEVICE define to src/rmd_types.h here. src/rmd_parseargs.c: That way we can get rid of the dependency to rmd_macro.h from here, yay! git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@554 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/src/rmd_macro.h | 6 ------ recordmydesktop/src/rmd_parseargs.c | 4 ++-- recordmydesktop/src/rmd_types.h | 4 ++++ 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'recordmydesktop/src') diff --git a/recordmydesktop/src/rmd_macro.h b/recordmydesktop/src/rmd_macro.h index 78e6102..9b54d80 100644 --- a/recordmydesktop/src/rmd_macro.h +++ b/recordmydesktop/src/rmd_macro.h @@ -84,12 +84,6 @@ #define Y_UNIT_WIDTH 0x0010 #define UV_UNIT_WIDTH 0x0008 -#ifdef HAVE_LIBASOUND - #define DEFAULT_AUDIO_DEVICE "hw:0,0" -#else - #define DEFAULT_AUDIO_DEVICE "/dev/dsp" -#endif - #define I16TOA(number,buffer){\ int t_num=(number),__k=0,__i=0;\ char *t_buf=malloc(8);\ diff --git a/recordmydesktop/src/rmd_parseargs.c b/recordmydesktop/src/rmd_parseargs.c index ab1f4f7..dcb2475 100644 --- a/recordmydesktop/src/rmd_parseargs.c +++ b/recordmydesktop/src/rmd_parseargs.c @@ -26,9 +26,9 @@ #include "config.h" -#include "rmd_types.h" +#include -#include "rmd_macro.h" +#include "rmd_types.h" static void PrintConfig(void) { diff --git a/recordmydesktop/src/rmd_types.h b/recordmydesktop/src/rmd_types.h index c93b8b7..145f419 100644 --- a/recordmydesktop/src/rmd_types.h +++ b/recordmydesktop/src/rmd_types.h @@ -37,9 +37,13 @@ #ifdef HAVE_LIBASOUND #include + + #define DEFAULT_AUDIO_DEVICE "hw:0,0" #else #include #include + + #define DEFAULT_AUDIO_DEVICE "/dev/dsp" #endif #ifdef HAVE_JACK_H -- cgit v1.2.1