From 90893f10480f875677235e171657cbed84e8a545 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 3 Jun 2010 05:07:10 +0000 Subject: [PATCH] Make the capitalization of FFmpegSource in options consistent, as option names are now case-sensitive. Originally committed to SVN as r4414. --- aegisub/src/ffmpegsource_common.cpp | 2 +- aegisub/src/libresrc/default_config.json | 4 ++-- aegisub/src/video_provider_ffmpegsource.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index eced81f7f..dddba32ad 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -199,7 +199,7 @@ void FFmpegSourceProvider::SetLogLevel() { FFMS_IndexErrorHandling FFmpegSourceProvider::GetErrorHandlingMode() { - wxString Mode = lagi_wxString(OPT_GET("Provider/Audio/FFMpegSource/Decode Error Handling")->GetString()); + wxString Mode = lagi_wxString(OPT_GET("Provider/Audio/FFmpegSource/Decode Error Handling")->GetString()); if (!Mode.CmpNoCase(_T("ignore"))) return FFMS_IEH_IGNORE; diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json index b53ee7834..f9808d8e7 100644 --- a/aegisub/src/libresrc/default_config.json +++ b/aegisub/src/libresrc/default_config.json @@ -202,7 +202,7 @@ "AVS" : { "Sample Rate" : 0 }, - "FFMpegSource" : { + "FFmpegSource" : { "Decode Error Handling" : "stop" }, "PCM" : { @@ -225,7 +225,7 @@ "Cache" : { "Size" : 32 }, - "FFMpegSource" : { + "FFmpegSource" : { "Decoding Threads" : 1, "Unsafe Seeking" : false } diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/aegisub/src/video_provider_ffmpegsource.cpp index 32600b640..82f6e6ce7 100644 --- a/aegisub/src/video_provider_ffmpegsource.cpp +++ b/aegisub/src/video_provider_ffmpegsource.cpp @@ -209,7 +209,7 @@ void FFmpegSourceVideoProvider::LoadVideo(wxString filename) { // set seekmode // TODO: give this its own option? int SeekMode; - if (OPT_GET("Provider/Video/FFMpegSource/Unsafe Seeking")->GetBool()) + if (OPT_GET("Provider/Video/FFmpegSource/Unsafe Seeking")->GetBool()) SeekMode = FFMS_SEEK_UNSAFE; else SeekMode = FFMS_SEEK_NORMAL;