iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed audio display on Linux, and had to change 

__attribute__((always_inline)) to just inline, since my g++ was bitching
about that.

Originally committed to SVN as r992.
This commit is contained in:
Rodrigo Braz Monteiro 2007-04-04 00:52:50 +00:00
parent 9c85a4795c
commit e72b0ae8c0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
aegisub/audio_box.cpp
View File

@ -62,7 +62,7 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
loaded = false;
karaokeMode = false;
// Controls
// Sash and Display
audioScroll = new wxScrollBar(this,Audio_Scrollbar);
audioScroll->PushEventHandler(new FocusEvent());
audioScroll->SetToolTip(_("Seek bar"));
@ -76,6 +76,11 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
Sash->SetMinimumSizeY(50);
audioDisplay->ScrollBar = audioScroll;
audioDisplay->box = this;
int _w,_h;
audioDisplay->GetSize(&_w,&_h);
audioDisplay->SetSizeHints(-1,_h,-1,_h);
// Zoom
HorizontalZoom = new wxSlider(this,Audio_Horizontal_Zoom,50,0,100,wxDefaultPosition,wxSize(-1,20),wxSL_VERTICAL);
HorizontalZoom->PushEventHandler(new FocusEvent());
HorizontalZoom->SetToolTip(_("Horizontal zoom"));
@ -360,12 +365,8 @@ void AudioBox::OnSash(wxSashEvent& event) {
if (oldh == h) return;
// Resize
audioDisplay->SetSizeHints(w,h,w,h);
audioDisplay->SetSizeHints(w,h,-1,h);
audioDisplay->SetSize(w,h);
int _w,_h;
audioDisplay->GetSize(&_w,&_h);
audioDisplay->SetSizeHints(_w,_h,_w,_h);
//sashSizer->Fit(Sash);
sashSizer->Layout();
Sash->GetParent()->Layout();

2
aegisub/utils.h
View File

@ -75,7 +75,7 @@ int SmallestPowerOf2(int x);
#ifdef __VISUALC__
#define FORCEINLINE __forceinline
#else
#define FORCEINLINE __attribute__((always_inline))
#define FORCEINLINE inline
#endif
#endif