diff --git a/aegisub/audio_player_openal.cpp b/aegisub/audio_player_openal.cpp index 4402c5b79..486854af1 100644 --- a/aegisub/audio_player_openal.cpp +++ b/aegisub/audio_player_openal.cpp @@ -396,4 +396,3 @@ int64_t OpenALPlayer::GetCurrentPosition() } - diff --git a/aegisub/audio_provider.cpp b/aegisub/audio_provider.cpp index 9811cd6fd..6c138f2cb 100644 --- a/aegisub/audio_provider.cpp +++ b/aegisub/audio_provider.cpp @@ -120,7 +120,7 @@ void AudioProvider::GetWaveForm(int *min,int *peak,int64_t start,int w,int h,int } if (!raw) { raw_len = needLen; - raw = (void*) new char[raw_len]; + raw = new char[raw_len]; } if (bytes_per_sample == 1) { diff --git a/aegisub/audio_provider.h b/aegisub/audio_provider.h index 506c0dc1b..622fce34b 100644 --- a/aegisub/audio_provider.h +++ b/aegisub/audio_provider.h @@ -54,7 +54,7 @@ class VideoProvider; // Audio provider class class AudioProvider { private: - void *raw; + char *raw; int raw_len; protected: diff --git a/aegisub/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp index 8a17943ac..105b544da 100644 --- a/aegisub/dialog_style_editor.cpp +++ b/aegisub/dialog_style_editor.cpp @@ -131,9 +131,9 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit // Create controls StyleName = new wxTextCtrl(this,-1,style->name); performance_timer.Start(); - FontName = new wxComboBox(this,TEXT_FONT_NAME,style->font,wxDefaultPosition,wxSize(150,20),0,0,wxCB_DROPDOWN | wxTE_PROCESS_ENTER); + FontName = new wxComboBox(this,TEXT_FONT_NAME,style->font,wxDefaultPosition,wxSize(150,-1),0,0,wxCB_DROPDOWN | wxTE_PROCESS_ENTER); wxLogDebug(_T("Time to create font face listbox: %d"), performance_timer.Time()); - FontSize = new wxTextCtrl(this,TEXT_FONT_SIZE,_T(""),wxDefaultPosition,wxSize(50,20),0,NumValidator(&FontSizeValue,true,false)); + FontSize = new wxTextCtrl(this,TEXT_FONT_SIZE,_T(""),wxDefaultPosition,wxSize(50,-1),0,NumValidator(&FontSizeValue,true,false)); //wxButton *FontButton = new wxButton(this,BUTTON_STYLE_FONT,_("Choose")); BoxBold = new wxCheckBox(this,CHECKBOX_STYLE_BOLD,_("Bold")); BoxItalic = new wxCheckBox(this,CHECKBOX_STYLE_ITALIC,_("Italic")); @@ -143,11 +143,11 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit colorButton[1] = new ColourButton(this,BUTTON_COLOR_2,wxSize(55,16),style->secondary.GetWXColor()); colorButton[2] = new ColourButton(this,BUTTON_COLOR_3,wxSize(55,16),style->outline.GetWXColor()); colorButton[3] = new ColourButton(this,BUTTON_COLOR_4,wxSize(55,16),style->shadow.GetWXColor()); - colorAlpha[0] = new wxSpinCtrl(this,TEXT_ALPHA_1,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,255,style->primary.a); - colorAlpha[1] = new wxSpinCtrl(this,TEXT_ALPHA_2,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,255,style->secondary.a); - colorAlpha[2] = new wxSpinCtrl(this,TEXT_ALPHA_3,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,255,style->outline.a); - colorAlpha[3] = new wxSpinCtrl(this,TEXT_ALPHA_4,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,255,style->shadow.a); - for (int i=0;i<3;i++) margin[i] = new wxSpinCtrl(this,TEXT_MARGIN_L+i,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,9999,style->Margin[i]); + colorAlpha[0] = new wxSpinCtrl(this,TEXT_ALPHA_1,_T(""),wxDefaultPosition,wxSize(60,-1),wxSP_ARROW_KEYS,0,255,style->primary.a); + colorAlpha[1] = new wxSpinCtrl(this,TEXT_ALPHA_2,_T(""),wxDefaultPosition,wxSize(60,-1),wxSP_ARROW_KEYS,0,255,style->secondary.a); + colorAlpha[2] = new wxSpinCtrl(this,TEXT_ALPHA_3,_T(""),wxDefaultPosition,wxSize(60,-1),wxSP_ARROW_KEYS,0,255,style->outline.a); + colorAlpha[3] = new wxSpinCtrl(this,TEXT_ALPHA_4,_T(""),wxDefaultPosition,wxSize(60,-1),wxSP_ARROW_KEYS,0,255,style->shadow.a); + for (int i=0;i<3;i++) margin[i] = new wxSpinCtrl(this,TEXT_MARGIN_L+i,_T(""),wxDefaultPosition,wxSize(60,-1),wxSP_ARROW_KEYS,0,9999,style->Margin[i]); margin[3] = 0; Alignment = new wxRadioBox(this, RADIO_ALIGNMENT, _("Alignment"), wxDefaultPosition, wxDefaultSize, 9, alignValues, 3, wxRA_SPECIFY_COLS); Outline = new wxTextCtrl(this,TEXT_OUTLINE,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&OutlineValue,true,false)); diff --git a/aegisub/macosx/.DS_Store b/aegisub/macosx/.DS_Store index c508529c7..add633b4c 100644 Binary files a/aegisub/macosx/.DS_Store and b/aegisub/macosx/.DS_Store differ diff --git a/aegisub/subs_edit_box.cpp b/aegisub/subs_edit_box.cpp index 4ee71cc54..b020081cb 100644 --- a/aegisub/subs_edit_box.cpp +++ b/aegisub/subs_edit_box.cpp @@ -81,35 +81,35 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren styles.Add(_T("")); CommentBox = new wxCheckBox(this,COMMENT_CHECKBOX,_("Comment")); CommentBox->SetToolTip(_("Comment this line out. Commented lines don't show up on screen.")); - StyleBox = new wxComboBox(this,STYLE_COMBOBOX,_T(""),wxDefaultPosition,wxSize(110,25),styles,wxCB_READONLY | wxTE_PROCESS_ENTER); + StyleBox = new wxComboBox(this,STYLE_COMBOBOX,_T(""),wxDefaultPosition,wxSize(110,-1),styles,wxCB_READONLY | wxTE_PROCESS_ENTER); StyleBox->SetToolTip(_("Style for this line.")); - ActorBox = new wxComboBox(this,ACTOR_COMBOBOX,_T(""),wxDefaultPosition,wxSize(110,25),styles,wxCB_DROPDOWN | wxTE_PROCESS_ENTER); + ActorBox = new wxComboBox(this,ACTOR_COMBOBOX,_T(""),wxDefaultPosition,wxSize(110,-1),styles,wxCB_DROPDOWN | wxTE_PROCESS_ENTER); ActorBox->SetToolTip(_("Actor name for this speech. This is only for reference, and is mainly useless.")); ActorBox->PushEventHandler(new IdleFieldHandler(ActorBox,_("Actor"))); - Effect = new HiliModTextCtrl(this,EFFECT_BOX,_T(""),wxDefaultPosition,wxSize(80,20),wxTE_PROCESS_ENTER); + Effect = new HiliModTextCtrl(this,EFFECT_BOX,_T(""),wxDefaultPosition,wxSize(80,-1),wxTE_PROCESS_ENTER); Effect->SetToolTip(_("Effect for this line. This can be used to store extra information for karaoke scripts, or for the effects supported by the renderer.")); Effect->PushEventHandler(new IdleFieldHandler(Effect,_("Effect"))); // Middle controls - Layer = new wxSpinCtrl(this,LAYER_BOX,_T(""),wxDefaultPosition,wxSize(50,20),wxSP_ARROW_KEYS,0,0x7FFFFFFF,0); + Layer = new wxSpinCtrl(this,LAYER_BOX,_T(""),wxDefaultPosition,wxSize(50,-1),wxSP_ARROW_KEYS,0,0x7FFFFFFF,0); Layer->SetToolTip(_("Layer number")); - StartTime = new TimeEdit(this,STARTTIME_BOX,_T(""),wxDefaultPosition,wxSize(75,20),wxTE_PROCESS_ENTER); + StartTime = new TimeEdit(this,STARTTIME_BOX,_T(""),wxDefaultPosition,wxSize(75,-1),wxTE_PROCESS_ENTER); StartTime->SetToolTip(_("Start time")); StartTime->showModified = true; - EndTime = new TimeEdit(this,ENDTIME_BOX,_T(""),wxDefaultPosition,wxSize(75,20),wxTE_PROCESS_ENTER); + EndTime = new TimeEdit(this,ENDTIME_BOX,_T(""),wxDefaultPosition,wxSize(75,-1),wxTE_PROCESS_ENTER); EndTime->SetToolTip(_("End time")); EndTime->isEnd = true; EndTime->showModified = true; - Duration = new TimeEdit(this,DURATION_BOX,_T(""),wxDefaultPosition,wxSize(75,20),wxTE_PROCESS_ENTER); + Duration = new TimeEdit(this,DURATION_BOX,_T(""),wxDefaultPosition,wxSize(75,-1),wxTE_PROCESS_ENTER); Duration->SetToolTip(_("Line duration")); Duration->showModified = true; - MarginL = new HiliModTextCtrl(this,MARGINL_BOX,_T(""),wxDefaultPosition,wxSize(40,20),wxTE_CENTRE | wxTE_PROCESS_ENTER,NumValidator()); + MarginL = new HiliModTextCtrl(this,MARGINL_BOX,_T(""),wxDefaultPosition,wxSize(40,-1),wxTE_CENTRE | wxTE_PROCESS_ENTER,NumValidator()); MarginL->SetToolTip(_("Left Margin (0 = default)")); MarginL->SetMaxLength(4); - MarginR = new HiliModTextCtrl(this,MARGINR_BOX,_T(""),wxDefaultPosition,wxSize(40,20),wxTE_CENTRE | wxTE_PROCESS_ENTER,NumValidator()); + MarginR = new HiliModTextCtrl(this,MARGINR_BOX,_T(""),wxDefaultPosition,wxSize(40,-1),wxTE_CENTRE | wxTE_PROCESS_ENTER,NumValidator()); MarginR->SetToolTip(_("Right Margin (0 = default)")); MarginR->SetMaxLength(4); - MarginV = new HiliModTextCtrl(this,MARGINV_BOX,_T(""),wxDefaultPosition,wxSize(40,20),wxTE_CENTRE | wxTE_PROCESS_ENTER,NumValidator()); + MarginV = new HiliModTextCtrl(this,MARGINV_BOX,_T(""),wxDefaultPosition,wxSize(40,-1),wxTE_CENTRE | wxTE_PROCESS_ENTER,NumValidator()); MarginV->SetToolTip(_("Vertical Margin (0 = default)")); MarginV->SetMaxLength(4); @@ -132,7 +132,7 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren Color3->SetToolTip(_("Outline color")); Color4 = new wxBitmapButton(this,BUTTON_COLOR4,wxBITMAP(button_color_four),wxDefaultPosition,wxSize(30,20)); Color4->SetToolTip(_("Shadow color")); - CommitButton = new wxButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxSize(55,20)); + CommitButton = new wxButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxSize(-1,20)); ToolTipManager::Bind(CommitButton,_("Commits the text (Enter). Hold Ctrl to stay in line (%KEY%)."),_T("Edit Box Commit")); ByTime = new wxRadioButton(this,RADIO_TIME_BY_TIME,_("Time"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP); ByTime->SetToolTip(_("Time by h:mm:ss.cs")); @@ -143,35 +143,35 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren TopSizer = new wxBoxSizer(wxHORIZONTAL); //TopSizer->Add(new FloatSpinCtrl(this,-1,wxDefaultPosition,wxSize(40,20),0,-20.0,50.0,0.0,0.5)); TopSizer->Add(CommentBox,0,wxRIGHT | wxALIGN_CENTER,5); - TopSizer->Add(StyleBox,2,wxRIGHT,5); - TopSizer->Add(ActorBox,2,wxRIGHT,5); - TopSizer->Add(Effect,3,0,0); + TopSizer->Add(StyleBox,2,wxRIGHT|wxALIGN_CENTER,5); + TopSizer->Add(ActorBox,2,wxRIGHT|wxALIGN_CENTER,5); + TopSizer->Add(Effect,3,wxALIGN_CENTER,5); // Middle sizer splitLineMode = true; MiddleSizer = new wxBoxSizer(wxHORIZONTAL); - MiddleSizer->Add(Layer,0,wxRIGHT,5); - MiddleSizer->Add(StartTime,0,wxRIGHT,0); - MiddleSizer->Add(EndTime,0,wxRIGHT,5); - MiddleSizer->Add(Duration,0,wxRIGHT,5); - MiddleSizer->Add(MarginL,0,0,0); - MiddleSizer->Add(MarginR,0,0,0); - MiddleSizer->Add(MarginV,0,0,0); + MiddleSizer->Add(Layer,0,wxRIGHT|wxALIGN_CENTER,5); + MiddleSizer->Add(StartTime,0,wxRIGHT|wxALIGN_CENTER,0); + MiddleSizer->Add(EndTime,0,wxRIGHT|wxALIGN_CENTER,5); + MiddleSizer->Add(Duration,0,wxRIGHT|wxALIGN_CENTER,5); + MiddleSizer->Add(MarginL,0,wxALIGN_CENTER,0); + MiddleSizer->Add(MarginR,0,wxALIGN_CENTER,0); + MiddleSizer->Add(MarginV,0,wxALIGN_CENTER,0); MiddleSizer->AddSpacer(5); // Middle-bottom sizer MiddleBotSizer = new wxBoxSizer(wxHORIZONTAL); - MiddleBotSizer->Add(Bold); - MiddleBotSizer->Add(Italics); - MiddleBotSizer->Add(Underline); - MiddleBotSizer->Add(Strikeout); - MiddleBotSizer->Add(FontName); + MiddleBotSizer->Add(Bold,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(Italics,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(Underline,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(Strikeout,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(FontName,0,wxALIGN_CENTER,0); MiddleBotSizer->AddSpacer(5); - MiddleBotSizer->Add(Color1); - MiddleBotSizer->Add(Color2); - MiddleBotSizer->Add(Color3); - MiddleBotSizer->Add(Color4,0,wxRIGHT,5); - MiddleBotSizer->Add(CommitButton,0,wxRIGHT,10); + MiddleBotSizer->Add(Color1,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(Color2,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(Color3,0,wxALIGN_CENTER,0); + MiddleBotSizer->Add(Color4,0,wxRIGHT|wxALIGN_CENTER,5); + MiddleBotSizer->Add(CommitButton,0,wxRIGHT|wxALIGN_CENTER,10); MiddleBotSizer->Add(ByTime,0,wxRIGHT | wxALIGN_CENTER,5); MiddleBotSizer->Add(ByFrame,0,wxRIGHT | wxALIGN_CENTER,5);