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

Added setting of subtitles provider and toggling of pixel shader use to options/video.

Browse source 
Originally committed to SVN as r1018.
This commit is contained in:
Rodrigo Braz Monteiro 2007-04-07 04:40:44 +00:00
parent 6d988bdf4d
commit 0abb0bd433
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/changelog.txt
View file

@ -27,10 +27,11 @@ Please visit http://aegisub.net to download latest version
o Normal and SSA mode have been merged into one, all functionality available to both is now used at once. This is the same behavior as Sabbu has. (AMZ)
o Next line on commit is now on by default.
o Auto-commit will never change to the next line.
o When dragging line start/end markers, they will snap to keyframes or nearby subtitle start/end markers, hold down "Shift" to override this behaviour.
o Added an option to, when dragging line start/end markers, snap to keyframes or nearby subtitle start/end markers. This behavior can always be toggled by holding down shift.
o The "Play" shortcut will always play, regardless of whether it was already playing or not. There is a new shortcut for "Stop".
o Styles for line start/end markers have changed.
o Holding down ctrl lets you retime the original line while in Karaoke mode.
o Middle click will now jump the video to the time under the mouse.
- Support reading SSA/ASS files with intermixed V4 and V4+ Styles sections. (jfs)
- Fixed loading of sections with unexpected cases. (AMZ)
- Plain-text export (jfs)

15
aegisub/dialog_options.cpp
View file

@ -54,6 +54,7 @@
#include "video_box.h"
#include "video_slider.h"
#include "video_provider.h"
#include "subtitles_provider.h"
#include "audio_box.h"
#include "audio_display.h"
@ -318,7 +319,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
wxSizer *videoSizer1 = new wxStaticBoxSizer(wxVERTICAL,videoPage,_("Options"));
wxSizer *videoSizer2 = new wxStaticBoxSizer(wxVERTICAL,videoPage,_("Advanced - EXPERT USERS ONLY"));
wxFlexGridSizer *videoSizer3 = new wxFlexGridSizer(5,2,5,5);
wxFlexGridSizer *videoSizer4 = new wxFlexGridSizer(3,2,5,5);
wxFlexGridSizer *videoSizer4 = new wxFlexGridSizer(4,2,5,5);
wxControl *control;
// First sizer
@ -359,12 +360,20 @@ DialogOptions::DialogOptions(wxWindow *parent)
control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,choices4,wxCB_DROPDOWN | wxCB_READONLY);
Bind(control,_T("Video provider"),1);
videoSizer4->Add(control,1,wxEXPAND);
videoSizer4->Add(new wxStaticText(videoPage,-1,_("Subtitles provider (except avisynth): ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);
wxArrayString choices5 = SubtitlesProviderFactory::GetFactoryList();
control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,choices5,wxCB_DROPDOWN | wxCB_READONLY);
Bind(control,_T("Subtitles provider"),1);
videoSizer4->Add(control,1,wxEXPAND);
videoSizer4->Add(new wxStaticText(videoPage,-1,_("Avisynth memory limit: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);
control = new wxTextCtrl(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator(NULL,false));
Bind(control,_T("Avisynth memorymax"));
videoSizer4->Add(control,1,wxEXPAND);
control = new wxCheckBox(videoPage,-1,_("Threaded video"));
Bind(control,_T("Threaded video"));
//control = new wxCheckBox(videoPage,-1,_("Threaded video"));
//Bind(control,_T("Threaded video"));
//videoSizer4->Add(control,1,wxEXPAND);
control = new wxCheckBox(videoPage,-1,_("Use pixel shaders if available"));
Bind(control,_T("Video use pixel shaders"));
videoSizer4->Add(control,1,wxEXPAND);
control = new wxCheckBox(videoPage,-1,_("Allow pre-2.56a Avisynth"));
Bind(control,_T("Allow Ancient Avisynth"));

2
aegisub/options.cpp
View file

@ -155,7 +155,7 @@ void OptionsManager::LoadDefaults() {
SetModificationType(MOD_AUTOMATIC);
SetBool(_T("Allow Ancient Avisynth"),false);
SetText(_T("Video Provider"),_T("Avisynth"));
SetText(_T("Subtitles Provider"),_T("CSRI"));
SetText(_T("Subtitles Provider"),_T("csri"));
SetBool(_T("Video Use Pixel Shaders"),false);
// Audio Options