From 2e37ba824684d22977b647d9a4cc8144fa2a65dd Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 23 Jan 2012 19:02:05 +0000 Subject: [PATCH] Remove redundant OSS device option Originally committed to SVN as r6341. --- aegisub/src/audio_player_oss.cpp | 2 +- aegisub/src/libresrc/default_config.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp index e1e0a8684..d06cd1f80 100644 --- a/aegisub/src/audio_player_oss.cpp +++ b/aegisub/src/audio_player_oss.cpp @@ -74,7 +74,7 @@ void OSSPlayer::OpenStream() bpf = provider->GetChannels() * provider->GetBytesPerSample(); // 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); if (dspdev < 0) { throw OSSError("OSS player: opening device failed", 0); diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json index 31aaa5a0c..b5b36e66f 100644 --- a/aegisub/src/libresrc/default_config.json +++ b/aegisub/src/libresrc/default_config.json @@ -63,9 +63,6 @@ "Lock Scroll on Cursor" : false, "Medusa Timing Hotkeys" : false, "Next Line on Commit" : true, - "OSS" : { - "Device" : "/dev/dsp" - }, "Player" : "", "Plays When Stepping Video" : false, "Provider" : "ffmpegsource",