diff options
| author | enselic <enselic@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2008-09-16 20:09:03 +0000 |
|---|---|---|
| committer | enselic <enselic@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2008-09-16 20:09:03 +0000 |
| commit | 055edad27bd6b8f0f1115b040021bf4486721df7 (patch) | |
| tree | c106bbaefc84fe83bce09f261a917eebbe4d6e4f | |
| parent | abb4bd4b3a8838bdca16cd849a4cf0640c6b96db (diff) | |
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
| -rw-r--r-- | recordmydesktop/src/rmd_macro.h | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_parseargs.c | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_types.h | 4 |
3 files changed, 6 insertions, 8 deletions
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 <stdio.h> -#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 <alsa/asoundlib.h> + + #define DEFAULT_AUDIO_DEVICE "hw:0,0" #else #include <sys/ioctl.h> #include <sys/soundcard.h> + + #define DEFAULT_AUDIO_DEVICE "/dev/dsp" #endif #ifdef HAVE_JACK_H |