From c42d2b4a4cd005ec75c70efc0bffee28a0f0ae03 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Tue, 21 Feb 2006 06:52:21 +0000 Subject: [PATCH] Fixed karaoke splitter Originally committed to SVN as r94. --- core/audio_karaoke.cpp | 3 ++- core/changelog.txt | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core/audio_karaoke.cpp b/core/audio_karaoke.cpp index 42ed42dcf..4b6c3e943 100644 --- a/core/audio_karaoke.cpp +++ b/core/audio_karaoke.cpp @@ -338,7 +338,7 @@ void AudioKaraoke::OnPaint(wxPaintEvent &event) { wxArrayInt widths; if (dc.GetPartialTextExtents(temptext, widths)) { for (unsigned int i = 0; i < syl.pending_splits.size(); i++) { - dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); + dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); dc.DrawLine(dx+4+widths[syl.pending_splits[i]], 0, dx+4+widths[syl.pending_splits[i]], h); } } else { @@ -464,6 +464,7 @@ void AudioKaraoke::OnMouse(wxMouseEvent &event) { //wxLogDebug(_T("Erasing entry")); num_removed++; syl.pending_splits.erase(i); + break; } else { i++; } diff --git a/core/changelog.txt b/core/changelog.txt index fd66a51de..27a30c60b 100644 --- a/core/changelog.txt +++ b/core/changelog.txt @@ -6,7 +6,7 @@ Please visit http://aegisub.net to download latest version - Always defaults to Audio Cache=1 (ram) now (Myrsloik) - Automation: Added xor(a,b) boolean logical function to utils.lua (jfs) - Automation: Various changes to karaskel.lua and karaskel-adv.lua: (jfs) - o Added some debug-calls (which are disable by default; aegisub.output_debug is replaced with a do-nothing function (you can change this in karaskel.lua) + o Added some debug-calls (which are disabled by default; aegisub.output_debug is replaced with a do-nothing function (you can change this in karaskel.lua) o The regular aegisub.output_debug is aliased to aegisub.output_warning, in order to always be able to show real warnings, in case something goes wrong o Fixed bug, triggered when a line had a style not defined in the subs. A warning is now shown instead. - Fixed bug in parser that would cause Aegisub to crash if you had a \fn without parameters and tried to pick font. (AMZ) @@ -19,25 +19,25 @@ Please visit http://aegisub.net to download latest version - Implemented FexTracker, for automatically tracking positions on the video and placing text accordingly (Tentacle) - Drag-and-drop files onto the program no longer causes the subs to be unloaded every time, even if no subs were dropped (jfs) - 1,1+2 recombining lines where 1 is a substring of 2 no longer causes incorrect behavior. 1+2,2 similarly fixed. This fix also gives more sanity-checking in the recombining (jfs) -- Replaced the subtitles grid with a custom control, which should hopefully behave and look better. (AMZ) -- Currently active line is now highlighted with a border in the grid. (AMZ) -- The subtitles grid can no longer receive focus. (AMZ) +- Replaced the subtitles grid with a custom control, which should hopefully behave and look better. (AMZ) Changes are: + o Currently active line is now highlighted with a border. + o The grid can no longer receive focus. + o Fixed bug related to tag cycling, which would reset grid, move video and force a refresh of everything (slow, and could undo uncommited changes). + o Rows colliding with the currently active one will now be highlighted in grid. + o Selected comments are now highlighted in a different color. + o Fixed behavior of deleting and joining lines on grid. - Toolbar will now properly disable the Jump To buttons if more than one line is selected. (AMZ) - Fixed the toolbar "grey area" glitch (was actually a wxWidgets issue). (AMZ) - Default video zoom can now be set in config.dat and is defaulted to 100%. (AMZ) - Fixed crash in Translation and Styling assistants, when you attempted to move past end of file, and then play. (AMZ) - Fixed linked commit of times, so it will only commit both times if the other was changed (to prevent damage when editing multiple lines). (AMZ) -- Fixed bug related to tag cycling, which would reset grid, move video and force a refresh of everything (slow, and could undo uncommited changes). (AMZ) - Fixed some bugs related to inserting overrides via the buttons over the edit box. (AMZ) - Implemented Redo. (AMZ) - Fonts collector will now default collection to same folder as script (Set to "?script" on config.dat). (AMZ) - Alt+Left/Right on the video seek bar will now seek by increments of 10 frames (increment is customizeable in config.dat). (AMZ) - Added a simple audio resync method afor video playback. (AMZ) - Audio timing will now apply to all selected lines, as well as active line. (AMZ) -- Rows colliding with the currently active one will now be highlighted in grid. (AMZ) -- Selected comments are now highlighted in a different color. (AMZ) - Added a volume slider bar to audio mode. (AMZ) -- Fixed behavior of deleting and joining lines on subtitles grid. (AMZ) - Fixed some internal workings, which should make Aegisub use considerably less RAM (especially for large Karaoke files, 3x less RAM usage measured). (AMZ) - Aegisub will now dump the stack to stack.txt when it crashes with a fatal exception, which might or might not work. (AMZ)