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

Fix compilation errors

Browse source 
Originally committed to SVN as r4718.
This commit is contained in:
Thomas Goyne 2010-08-02 07:21:02 +00:00
parent c10e9e3a5b
commit ff85906cdc
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/src/audio_provider_pcm.cpp
View file

@ -55,6 +55,7 @@
#include "aegisub_endian.h"
#include "audio_provider_pcm.h"
#include "compat.h"
#include "utils.h"
@ -74,7 +75,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
0);
if (file_handle == INVALID_HANDLE_VALUE) {
throw agi::FileNotFoundError(filename);
throw agi::FileNotFoundError(STD_STR(filename));
}
LARGE_INTEGER li_file_size = {0};
@ -103,7 +104,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
file_handle = open(filename.mb_str(*wxConvFileName), O_RDONLY);
if (file_handle == -1) {
throw agi::FileNotFoundError(filename);
throw agi::FileNotFoundError(STD_STR(filename));
}
struct stat filestats;

1
aegisub/src/subtitles_provider_libass.cpp
View file

@ -56,6 +56,7 @@ extern "C" {
#include "subtitles_provider_libass.h"
#include "utils.h"
#include "video_context.h"
#include "video_frame.h"
/// @brief Handle libass messages

2
aegisub/src/threaded_frame_source.cpp
View file

@ -204,7 +204,7 @@ VideoProviderErrorEvent::VideoProviderErrorEvent(VideoProviderError const& err)
SetEventType(EVT_VIDEO_ERROR);
}
SubtitlesProviderErrorEvent::SubtitlesProviderErrorEvent(wxString err)
: agi::Exception(err, NULL)
: agi::Exception(STD_STR(err), NULL)
{
SetEventType(EVT_SUBTITLES_ERROR);
}