[mythtv] [mythtv-commits] mythtv commit: r25164 - in trunk/mythtv by jyavenard

[Peter Stokes]

Hi,

r25164 requires a an extra #ifdef in order to compile with Pulse audio disabled...

Thanks

Peter Stokes


Index: mythtv/libs/libmyth/audiooutput.cpp
===================================================================
--- mythtv/libs/libmyth/audiooutput.cpp	(revision 25165)
+++ mythtv/libs/libmyth/audiooutput.cpp	(working copy)
@@ -145,8 +145,10 @@
         VERBOSE(VB_IMPORTANT, "No useable audio output driver found.");
         VERBOSE(VB_IMPORTANT, "Don't disable OSS support unless you're "
                               "not running on Linux.");
+#ifdef USING_PULSE
         if (pulsestatus)
             pulseaudio_handle_teardown();
+#endif
         return NULL;
     }
 #ifdef USING_PULSE




On 24 Jun 2010, at 12:59, mythtv at cvs.mythtv.org wrote:

>      Author: jyavenard
>        Date: 2010-06-24 11:59:15 +0000 (Thu, 24 Jun 2010)
> New Revision: 25164
>   Changeset: http://svn.mythtv.org/trac/changeset/25164
> 
> Modified:
> 
>   trunk/mythtv/libs/libmyth/audiooutput.cpp
>   trunk/mythtv/libs/libmyth/audiooutput.h
>   trunk/mythtv/libs/libmyth/audiooutputalsa.cpp
>   trunk/mythtv/libs/libmyth/audiooutputbase.cpp
>   trunk/mythtv/libs/libmyth/audiooutputbase.h
>   trunk/mythtv/libs/libmyth/audiooutputca.cpp
>   trunk/mythtv/libs/libmyth/audiooutputdx.cpp
>   trunk/mythtv/libs/libmyth/audiooutputjack.cpp
>   trunk/mythtv/libs/libmyth/audiooutputnull.cpp
>   trunk/mythtv/libs/libmyth/audiooutputoss.cpp
>   trunk/mythtv/libs/libmyth/audiooutputpulse.cpp
>   trunk/mythtv/libs/libmyth/audiooutputpulse.h
>   trunk/mythtv/libs/libmyth/audiooutputsettings.cpp
>   trunk/mythtv/libs/libmyth/audiooutputsettings.h
>   trunk/mythtv/libs/libmyth/audiooutputwin.cpp
>   trunk/mythtv/libs/libmyth/audiopulseutil.cpp
>   trunk/mythtv/libs/libmyth/audiosettings.cpp
>   trunk/mythtv/libs/libmyth/audiosettings.h
>   trunk/mythtv/libs/libmyth/settings.h
>   trunk/mythtv/libs/libmythtv/audioplayer.cpp
>   trunk/mythtv/libs/libmythtv/audioplayer.h
>   trunk/mythtv/libs/libmythtv/avformatdecoder.cpp
>   trunk/mythtv/libs/libmythtv/avformatdecoder.h
>   trunk/mythtv/programs/mythavtest/main.cpp
>   trunk/mythtv/programs/mythfrontend/globalsettings.cpp
>   trunk/mythtv/programs/mythfrontend/globalsettings.h
>   trunk/mythtv/programs/mythfrontend/main.cpp
> 
> Log:
> 
> Major audio settings rewrite. The settings page is now fully dynamic and not populated with static entries. Capabilities are accessible according to what the audio device can actually support.
> PulseAudio server is now only suspended as required and only when audio needs to be played. User settings are now ignored if incompatible with selected audio device.
> Add 'Scan' button in the settings page that will fill the list of devices available. We do so in order to speed up mythfrontend startup time as scanning for all devices can take a few seconds.
> 
> Typical user scenario when mythfrontend is first started, is to go to the settings; Press the scan button and choose the audio device required. If entering a custom device, not appearing in the list, enter the name then press Scan. Capabilities will then be retrieved or the user will be prompted if it is invalid.
> 
> 
> _______________________________________________
> mythtv-commits mailing list
> mythtv-commits at mythtv.org
> http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-commits