Fix compilation errors
Originally committed to SVN as r4718.
This commit is contained in:
parent
c10e9e3a5b
commit
ff85906cdc
3 changed files with 5 additions and 3 deletions
|
@ -55,6 +55,7 @@
|
||||||
|
|
||||||
#include "aegisub_endian.h"
|
#include "aegisub_endian.h"
|
||||||
#include "audio_provider_pcm.h"
|
#include "audio_provider_pcm.h"
|
||||||
|
#include "compat.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,7 +75,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
|
||||||
0);
|
0);
|
||||||
|
|
||||||
if (file_handle == INVALID_HANDLE_VALUE) {
|
if (file_handle == INVALID_HANDLE_VALUE) {
|
||||||
throw agi::FileNotFoundError(filename);
|
throw agi::FileNotFoundError(STD_STR(filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
LARGE_INTEGER li_file_size = {0};
|
LARGE_INTEGER li_file_size = {0};
|
||||||
|
@ -103,7 +104,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
|
||||||
file_handle = open(filename.mb_str(*wxConvFileName), O_RDONLY);
|
file_handle = open(filename.mb_str(*wxConvFileName), O_RDONLY);
|
||||||
|
|
||||||
if (file_handle == -1) {
|
if (file_handle == -1) {
|
||||||
throw agi::FileNotFoundError(filename);
|
throw agi::FileNotFoundError(STD_STR(filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
struct stat filestats;
|
struct stat filestats;
|
||||||
|
|
|
@ -56,6 +56,7 @@ extern "C" {
|
||||||
#include "subtitles_provider_libass.h"
|
#include "subtitles_provider_libass.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "video_context.h"
|
#include "video_context.h"
|
||||||
|
#include "video_frame.h"
|
||||||
|
|
||||||
|
|
||||||
/// @brief Handle libass messages
|
/// @brief Handle libass messages
|
||||||
|
|
|
@ -204,7 +204,7 @@ VideoProviderErrorEvent::VideoProviderErrorEvent(VideoProviderError const& err)
|
||||||
SetEventType(EVT_VIDEO_ERROR);
|
SetEventType(EVT_VIDEO_ERROR);
|
||||||
}
|
}
|
||||||
SubtitlesProviderErrorEvent::SubtitlesProviderErrorEvent(wxString err)
|
SubtitlesProviderErrorEvent::SubtitlesProviderErrorEvent(wxString err)
|
||||||
: agi::Exception(err, NULL)
|
: agi::Exception(STD_STR(err), NULL)
|
||||||
{
|
{
|
||||||
SetEventType(EVT_SUBTITLES_ERROR);
|
SetEventType(EVT_SUBTITLES_ERROR);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue