diff options
| author | elupus <elupus@svn> | 2010-12-22 18:37:47 +0000 |
|---|---|---|
| committer | elupus <elupus@svn> | 2010-12-22 18:37:47 +0000 |
| commit | 3a53d591b414ea1a6048b6b89a6efd56e9aee7fd (patch) | |
| tree | 3cddb6555d5d7655b8aa93a24e4d409f67909f15 | |
| parent | 22705a2694ff576e899006f2926dbd2996f21873 (diff) | |
changed: allow selection of both alsa devices and pulse devices even if pulse is available
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35668 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | xbmc/cores/AudioRenderers/ALSADirectSound.cpp | 10 | ||||
| -rw-r--r-- | xbmc/cores/AudioRenderers/AudioRendererFactory.cpp | 2 | ||||
| -rw-r--r-- | xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/xbmc/cores/AudioRenderers/ALSADirectSound.cpp b/xbmc/cores/AudioRenderers/ALSADirectSound.cpp index 3bd2a965d6..765902fded 100644 --- a/xbmc/cores/AudioRenderers/ALSADirectSound.cpp +++ b/xbmc/cores/AudioRenderers/ALSADirectSound.cpp @@ -624,14 +624,14 @@ void CALSADirectSound::EnumerateAudioSinks(AudioSinkList& vAudioSinks, bool pass { if (!passthrough) { - vAudioSinks.push_back(AudioSink(g_localizeStrings.Get(409), "alsa:default")); - vAudioSinks.push_back(AudioSink("iec958" , "alsa:plug:iec958")); - vAudioSinks.push_back(AudioSink("hdmi" , "alsa:plug:hdmi")); + vAudioSinks.push_back(AudioSink(g_localizeStrings.Get(409) + " (ALSA)", "alsa:default")); + vAudioSinks.push_back(AudioSink("iec958 (ALSA)" , "alsa:plug:iec958")); + vAudioSinks.push_back(AudioSink("hdmi (ALSA)" , "alsa:plug:hdmi")); } else { - vAudioSinks.push_back(AudioSink("iec958" , "alsa:iec958")); - vAudioSinks.push_back(AudioSink("hdmi" , "alsa:hdmi")); + vAudioSinks.push_back(AudioSink("iec958 (ALSA)" , "alsa:iec958")); + vAudioSinks.push_back(AudioSink("hdmi (ALSA)" , "alsa:hdmi")); } int n_cards = -1; diff --git a/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp b/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp index 6da0282297..9b699c3f87 100644 --- a/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp +++ b/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp @@ -157,8 +157,6 @@ void CAudioRendererFactory::EnumerateAudioSinks(AudioSinkList& vAudioSinks, bool { #ifdef HAS_PULSEAUDIO CPulseAudioDirectSound::EnumerateAudioSinks(vAudioSinks, passthrough); - if (vAudioSinks.size() > 0) - return; #endif #ifdef WIN32 diff --git a/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp b/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp index ef50afea93..ece525052c 100644 --- a/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp +++ b/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp @@ -128,7 +128,7 @@ static void SinkInfo(pa_context *c, const pa_sink_info *i, int eol, void *userda SinkInfoStruct *sinkStruct = (SinkInfoStruct *)userdata; if (i && i->name) { - CStdString descr = i->description; + CStdString descr = i->description + CStdString(" (PulseAudio)"); CStdString sink; sink.Format("pulse:%s@default", i->name); sinkStruct->list->push_back(AudioSink(descr, sink)); @@ -627,7 +627,7 @@ void CPulseAudioDirectSound::EnumerateAudioSinks(AudioSinkList& vAudioSinks, boo SinkInfoStruct sinkStruct; sinkStruct.mainloop = mainloop; sinkStruct.list = &vAudioSinks; - vAudioSinks.push_back(AudioSink(g_localizeStrings.Get(409), "pulse:default@default")); + vAudioSinks.push_back(AudioSink(g_localizeStrings.Get(409) + " (PulseAudio)", "pulse:default@default")); WaitForOperation(pa_context_get_sink_info_list(context, SinkInfo, &sinkStruct), mainloop, "EnumerateAudioSinks"); pa_threaded_mainloop_unlock(mainloop); |