forked from mia/Aegisub
Some random changes around.
Originally committed to SVN as r1813.
This commit is contained in:
parent
1afa7566ab
commit
7e83986497
|
@ -108,9 +108,9 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
|
||||||
|
|
||||||
// VertVol sider
|
// VertVol sider
|
||||||
wxSizer *VertVol = new wxBoxSizer(wxHORIZONTAL);
|
wxSizer *VertVol = new wxBoxSizer(wxHORIZONTAL);
|
||||||
wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL);
|
|
||||||
VertVol->Add(VerticalZoom,1,wxEXPAND,0);
|
VertVol->Add(VerticalZoom,1,wxEXPAND,0);
|
||||||
VertVol->Add(VolumeBar,1,wxEXPAND,0);
|
VertVol->Add(VolumeBar,1,wxEXPAND,0);
|
||||||
|
wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL);
|
||||||
VertVolArea->Add(VertVol,1,wxEXPAND,0);
|
VertVolArea->Add(VertVol,1,wxEXPAND,0);
|
||||||
VertVolArea->Add(VerticalLink,0,wxEXPAND,0);
|
VertVolArea->Add(VerticalLink,0,wxEXPAND,0);
|
||||||
|
|
||||||
|
|
|
@ -594,13 +594,13 @@ void AudioDisplay::DrawSpectrum(wxDC &finaldc,bool weak) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!weak) {
|
if (!weak) {
|
||||||
unsigned char *img = (unsigned char *)malloc(h*w*3); // wxImage requires using malloc
|
|
||||||
|
|
||||||
if (!spectrumRenderer)
|
if (!spectrumRenderer)
|
||||||
spectrumRenderer = new AudioSpectrum(provider);
|
spectrumRenderer = new AudioSpectrum(provider);
|
||||||
|
|
||||||
spectrumRenderer->SetScaling(scale);
|
spectrumRenderer->SetScaling(scale);
|
||||||
|
|
||||||
|
unsigned char *img = (unsigned char *)malloc(h*w*3); // wxImage requires using malloc
|
||||||
|
|
||||||
// Use a slightly slower, but simple way
|
// Use a slightly slower, but simple way
|
||||||
// Always draw the spectrum for the entire width
|
// Always draw the spectrum for the entire width
|
||||||
// Hack: without those divs by 2 the display is horizontally compressed
|
// Hack: without those divs by 2 the display is horizontally compressed
|
||||||
|
|
|
@ -363,12 +363,12 @@ void AudioKaraoke::OnPaint(wxPaintEvent &event) {
|
||||||
if (syl.pending_splits.size() > 0) {
|
if (syl.pending_splits.size() > 0) {
|
||||||
wxArrayInt widths;
|
wxArrayInt widths;
|
||||||
if (dc.GetPartialTextExtents(temptext, widths)) {
|
if (dc.GetPartialTextExtents(temptext, widths)) {
|
||||||
for (unsigned int i = 0; i < syl.pending_splits.size(); i++) {
|
for (unsigned int j = 0; j < syl.pending_splits.size(); j++) {
|
||||||
dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
|
dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
|
||||||
int splitxpos = dx + 4;
|
int splitxpos = dx + 4;
|
||||||
// Handle splitters placed before first char in syllable; these are represented as -1
|
// Handle splitters placed before first char in syllable; these are represented as -1
|
||||||
if (syl.pending_splits[i] >= 0) {
|
if (syl.pending_splits[j] >= 0) {
|
||||||
splitxpos += widths[syl.pending_splits[i]];
|
splitxpos += widths[syl.pending_splits[j]];
|
||||||
} else {
|
} else {
|
||||||
splitxpos += 0;
|
splitxpos += 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,5 +45,4 @@
|
||||||
// MatroskaParser.c, as well as any possible future .c files.
|
// MatroskaParser.c, as well as any possible future .c files.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
#include "stdwx.h"
|
#include "stdwx.h"
|
||||||
|
|
|
@ -60,6 +60,7 @@
|
||||||
|
|
||||||
/////////////////////
|
/////////////////////
|
||||||
// wxWidgets headers
|
// wxWidgets headers
|
||||||
|
#pragma warning(disable: 6011)
|
||||||
#include <wx/wxprec.h>
|
#include <wx/wxprec.h>
|
||||||
#include <wx/notebook.h>
|
#include <wx/notebook.h>
|
||||||
#include <wx/statline.h>
|
#include <wx/statline.h>
|
||||||
|
@ -91,6 +92,7 @@
|
||||||
#include <wx/glcanvas.h>
|
#include <wx/glcanvas.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
///////////////
|
///////////////
|
||||||
// STD headers
|
// STD headers
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
Loading…
Reference in a new issue