This is a small OSS define patch I did back in Oct updated to current CVS.
Basically it moves the USING_OSS define from the main settings.pro into libmyth.pro like the other audio defines. Cuts down on one more thing being passed to every compile line when it is only needed in libmyth.
I also changed the printf's in audiooutput.cpp to VERBOSE.
Thanks, David
Index: settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/settings.pro,v
retrieving revision 1.88
diff -u -r1.88 settings.pro
--- settings.pro 27 Jan 2005 23:43:13 -0000 1.88
+++ settings.pro 28 Jan 2005 02:22:53 -0000
@@ -57,7 +57,6 @@
# Default audio output, OSS
CONFIG += using_oss
-DEFINES += USING_OSS
# Native ALSA support
#CONFIG += using_alsa
@@ -152,7 +151,6 @@
CONFIG -= using_ivtv
DEFINES -= USING_IVTV
CONFIG -= using_oss
- DEFINES -= USING_OSS
CONFIG -= using_joystick_menu
}
win32 {
@@ -162,7 +160,6 @@
CONFIG -= using_ivtv
DEFINES -= USING_IVTV
CONFIG -= using_oss
- DEFINES -= USING_OSS
CONFIG -= using_joystick_menu
}
freebsd {
Index: libs/libmyth/audiooutput.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/audiooutput.cpp,v
retrieving revision 1.14
diff -u -r1.14 audiooutput.cpp
--- libs/libmyth/audiooutput.cpp 27 Jan 2005 23:43:13 -0000 1.14
+++ libs/libmyth/audiooutput.cpp 28 Jan 2005 02:22:53 -0000
@@ -35,7 +35,7 @@
return new AudioOutputALSA(audiodevice.remove(0, 5), audio_bits,
audio_channels, audio_samplerate, source, set_initial_vol);
#else
- printf("Audio output device is set to an ALSA device but ALSA support is not compiled in!\n");
+ VERBOSE(VB_IMPORTANT, "Audio output device is set to an ALSA device but ALSA support is not compiled in!\n");
return NULL;
#endif
}
@@ -45,7 +45,7 @@
return new AudioOutputARTS(audiodevice.remove(0, 5), audio_bits,
audio_channels, audio_samplerate, source, set_initial_vol);
#else
- printf("Audio output device is set to an ARTS device but ARTS support is not compiled in!\n");
+ VERBOSE(VB_IMPORTANT, "Audio output device is set to an ARTS device but ARTS support is not compiled in!\n");
return NULL;
#endif
}
@@ -55,7 +55,7 @@
return new AudioOutputJACK(audiodevice.remove(0, 5), audio_bits,
audio_channels, audio_samplerate, source, set_initial_vol);
#else
- printf("Audio output device is set to a JACK device but JACK support is not compiled in!\n");
+ VERBOSE(VB_IMPORTANT, "Audio output device is set to a JACK device but JACK support is not compiled in!\n");
return NULL;
#endif
}
@@ -73,8 +73,8 @@
audio_channels, audio_samplerate, source, set_initial_vol);
#endif
- printf("No useable audio output driver found.\n");
- printf("Don't disable OSS support unless you're not running on Linux.\n");
+ VERBOSE(VB_IMPORTANT, "No useable audio output driver found.\n");
+ VERBOSE(VB_IMPORTANT, "Don't disable OSS support unless you're not running on Linux.\n");
return NULL;
}
Index: libs/libmyth/libmyth.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/libmyth.pro,v
retrieving revision 1.64
diff -u -r1.64 libmyth.pro
--- libs/libmyth/libmyth.pro 27 Jan 2005 09:20:53 -0000 1.64
+++ libs/libmyth/libmyth.pro 28 Jan 2005 02:22:53 -0000
@@ -47,6 +47,7 @@
inc.files += visual.h volumebase.h output.h
using_oss {
+ DEFINES += USING_OSS
SOURCES += audiooutputoss.cpp
HEADERS += audiooutputoss.h
}
_______________________________________________ mythtv-dev mailing list [email protected] http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev
