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

Minor fixes for (old) OS X builds

Browse source 
Originally committed to SVN as r1664.
This commit is contained in:
Niels Martin Hansen 2008-01-05 00:02:06 +00:00
parent 68203a896a
commit f27241bd3f
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/dialog_options.cpp
View file

@ -523,7 +523,10 @@ DialogOptions::DialogOptions(wxWindow *parent)
// Controls // Controls
wxString choices2[3] = { _("None (NOT RECOMMENDED)"), _("RAM"), _("Hard Disk") }; wxString choices2[3] = { _("None (NOT RECOMMENDED)"), _("RAM"), _("Hard Disk") };
#ifdef WIN32
wxString choices3[3] = { _T("ConvertToMono"), _T("GetLeftChannel"), _T("GetRightChannel") }; wxString choices3[3] = { _T("ConvertToMono"), _T("GetLeftChannel"), _T("GetRightChannel") };
#endif
AddComboControl(audioAdvPage,audioAdvSizer1,_("Audio provider"),_T("Audio Provider"),AudioProviderFactory::GetFactoryList(),true,1); AddComboControl(audioAdvPage,audioAdvSizer1,_("Audio provider"),_T("Audio Provider"),AudioProviderFactory::GetFactoryList(),true,1);
AddComboControl(audioAdvPage,audioAdvSizer1,_("Audio player"),_T("Audio Player"),AudioPlayerFactory::GetFactoryList(),true,1); AddComboControl(audioAdvPage,audioAdvSizer1,_("Audio player"),_T("Audio Player"),AudioPlayerFactory::GetFactoryList(),true,1);
AddComboControl(audioAdvPage,audioAdvSizer1,_("Cache type"),_T("Audio Cache"),wxArrayString(3,choices2),true); AddComboControl(audioAdvPage,audioAdvSizer1,_("Cache type"),_T("Audio Cache"),wxArrayString(3,choices2),true);

4
aegisub/mkv_wrap.cpp
View file

@ -490,8 +490,8 @@ void MatroskaWrapper::GetSubtitles(AssFile *target) {
#define std_ftell _ftelli64 #define std_ftell _ftelli64
#else #else
#define std_fread fread #define std_fread fread
#define std_fseek fseeko64 #define std_fseek fseeko
#define std_ftell ftello64 #define std_ftell ftello
#endif #endif
/////////////// ///////////////

4
aegisub/video_context.cpp
View file

@ -62,7 +62,7 @@
#include "ass_style.h" #include "ass_style.h"
#include "subs_grid.h" #include "subs_grid.h"
#include "vfw_wrap.h" #include "vfw_wrap.h"
#ifndef __WINDOWS__ #if !defined(__WINDOWS__) && !defined(__APPLE__)
#include "lavc_keyframes.h" #include "lavc_keyframes.h"
#endif #endif
#include "mkv_wrap.h" #include "mkv_wrap.h"
@ -290,8 +290,10 @@ void VideoContext::SetVideo(const wxString &filename) {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
KeyFrames = VFWWrapper::GetKeyFrames(filename); KeyFrames = VFWWrapper::GetKeyFrames(filename);
#else #else
#ifndef __APPLE__
LAVCKeyFrames k(filename); LAVCKeyFrames k(filename);
KeyFrames = k.GetKeyFrames(); KeyFrames = k.GetKeyFrames();
#endif
#endif #endif
keyFramesLoaded = true; keyFramesLoaded = true;
} }