mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Add portaudio device selection to the preferences dialog and filter the list of devices to only output devices

Browse source 
Originally committed to SVN as r5919.
This commit is contained in:
Thomas Goyne 2011-11-28 20:01:58 +00:00
parent 87496b8767
commit 3c83d7e326
4 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
aegisub/src/audio_player_portaudio.cpp
View file

@ -39,13 +39,11 @@
#ifdef WITH_PORTAUDIO
// Headers
#include <libaegisub/log.h>
#include "audio_player_portaudio.h"
#include "include/aegisub/audio_provider.h"
#include "charset_conv.h"
#include "include/aegisub/audio_provider.h"
#include "main.h"
#include "utils.h"
@ -75,14 +73,31 @@ PortAudioPlayer::~PortAudioPlayer() {
}
void PortAudioPlayer::OpenStream() {
PaDeviceIndex pa_device = OPT_GET("Player/Audio/PortAudio/Device")->GetInt();
PaDeviceIndex pa_device = paNoDevice;
if (pa_device < 0) {
std::string device_name = OPT_GET("Player/Audio/PortAudio/Device Name")->GetString();
if (device_name.size() && device_name != "Default") {
int devices = Pa_GetDeviceCount();
for (int i = 0; i < devices; i++) {
const PaDeviceInfo *info = Pa_GetDeviceInfo(i);
if (info->maxOutputChannels > 0 && info->name == device_name) {
pa_device = i;
LOG_D("audio/player/portaudio") << "using config device: " << device_name << ": " << pa_device;
break;
}
}
if (pa_device == paNoDevice)
LOG_D("audio/player/portaudio") << "config device " << device_name << " not found, using default";
}
if (pa_device == paNoDevice) {
pa_device = Pa_GetDefaultOutputDevice();
if (pa_device == paNoDevice)
throw PortAudioError("No PortAudio output devices found");
LOG_D("audio/player/portaudio") << "using default output device:" << pa_device;
}
else
LOG_D("audio/player/portaudio") << "using config device: " << pa_device;
PaStreamParameters pa_output_p;
pa_output_p.device = pa_device;
@ -215,9 +230,14 @@ wxArrayString PortAudioPlayer::GetOutputDevices() {
PortAudioPlayer player; // temp player to ensure PA is initialized
int devices = Pa_GetDeviceCount();
wxArrayString list;
list.push_back("Default");
for (int i = 0; i < devices; i++) {
list.push_back(wxString(Pa_GetDeviceInfo(i)->name, wxConvUTF8));
const PaDeviceInfo *info = Pa_GetDeviceInfo(i);
if (info->maxOutputChannels > 0)
list.push_back(wxString(info->name, wxConvUTF8));
}
return list;

2
aegisub/src/libresrc/default_config.json
View file

@ -210,7 +210,7 @@
"Device" : "/dev/dsp"
},
"PortAudio" : {
"Device" : -1
"Device Name" : "Default"
}
}
},

9
aegisub/src/preferences.cpp
View file

@ -54,6 +54,10 @@
#include "preferences_base.h"
#include "video_provider_manager.h"
#ifdef WITH_PORTAUDIO
#include "audio_player_portaudio.h"
#endif
#define CLASS_PAGE(name) \
class name: public OptionPage { \
public: \
@ -469,6 +473,11 @@ Advanced_Audio::Advanced_Audio(wxTreebook *book, Preferences *parent): OptionPag
OptionChoice(windows, _("Avisynth down-mixer"), adm_choice, "Audio/Downmixer");
#endif
#ifdef WITH_PORTAUDIO
wxFlexGridSizer *portaudio = PageSizer(_("Portaudio"));
OptionChoice(portaudio, _("Portaudio device"), PortAudioPlayer::GetOutputDevices(), "Player/Audio/PortAudio/Device Name");
#endif
SetSizerAndFit(sizer);
}

2
aegisub/src/preferences_base.cpp
View file

@ -180,7 +180,7 @@ void OptionPage::OptionChoice(wxFlexGridSizer *flex, const wxString &name, const
switch (opt->GetType()) {
case agi::OptionValue::Type_Int: {
int val = opt->GetInt();
cb->SetValue(choices[val < (int)choices.size() ? val : opt->GetDefaultInt()]);
cb->Select(val < (int)choices.size() ? val : opt->GetDefaultInt());
cb->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, IntCBUpdater(opt_name, parent));
break;
}