mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove redundant OSS device option

Browse source 
Originally committed to SVN as r6341.
This commit is contained in:
Thomas Goyne 2012-01-23 19:02:05 +00:00
parent 1f8005d8d1
commit 2e37ba8246
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/audio_player_oss.cpp
View file

@ -74,7 +74,7 @@ void OSSPlayer::OpenStream()
bpf = provider->GetChannels() * provider->GetBytesPerSample(); bpf = provider->GetChannels() * provider->GetBytesPerSample();
// Open device // Open device
wxString device = lagi_wxString(OPT_GET("Audio/OSS/Device")->GetString()); wxString device = lagi_wxString(OPT_GET("Player/Audio/OSS/Device")->GetString());
dspdev = ::open(device.mb_str(wxConvUTF8), O_WRONLY, 0); dspdev = ::open(device.mb_str(wxConvUTF8), O_WRONLY, 0);
if (dspdev < 0) { if (dspdev < 0) {
throw OSSError("OSS player: opening device failed", 0); throw OSSError("OSS player: opening device failed", 0);

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

@ -63,9 +63,6 @@
"Lock Scroll on Cursor" : false, "Lock Scroll on Cursor" : false,
"Medusa Timing Hotkeys" : false, "Medusa Timing Hotkeys" : false,
"Next Line on Commit" : true, "Next Line on Commit" : true,
"OSS" : {
"Device" : "/dev/dsp"
},
"Player" : "", "Player" : "",
"Plays When Stepping Video" : false, "Plays When Stepping Video" : false,
"Provider" : "ffmpegsource", "Provider" : "ffmpegsource",