Commit Graph

4426 Commits

Author SHA1 Message Date
Thomas Goyne 79684d5ad6 Factor out bounds-checking for GetAudio to a single place
It was being done in inconsistent ways in several places, which did not
include all of the places it needed to be done.

Closes #1509.

Originally committed to SVN as r6960.
2012-08-19 14:11:29 -07:00
Thomas Goyne 037d385419 Guard uses of audio providers with a mutex when not using a cache as they aren't thread-safe. Updates #1509.
Originally committed to SVN as r6959.
2012-08-19 14:11:29 -07:00
Thomas Goyne 5a38d69921 Open files as binary in TextFileReader
Text mode does undesirable things like stopping when it hits an EOF
byte, which can be a valid part of a UTF-16 character, and line_iterator
handles stripping \r anyway.

Originally committed to SVN as r6958.
2012-08-19 14:11:29 -07:00
Thomas Goyne e774902a29 Always write a newline at the end of ASS files
Originally committed to SVN as r6957.
2012-08-19 14:11:29 -07:00
Thomas Goyne b265d1fa0e Actually set the actor when reading from txt files
Originally committed to SVN as r6956.
2012-08-19 14:11:29 -07:00
Thomas Goyne d132364025 Fix check for OS X version in the update checker
Originally committed to SVN as r6955.
2012-08-19 14:11:28 -07:00
Thomas Goyne 21841e84a8 Get the locale name for OS X from CF rather than wx
Originally committed to SVN as r6954.
2012-08-19 14:11:28 -07:00
Thomas Goyne f2035d76fc Don't block the source of a drag-and-drop while the dropped audio/video are loading
Originally committed to SVN as r6953.
2012-08-04 16:31:44 +00:00
Thomas Goyne b86a1bfb2d Fix compilation with wx 2.9.4 with 2.8 compatibility enabled. Closes #1504.
Originally committed to SVN as r6952.
2012-08-03 02:32:30 +00:00
Thomas Goyne e2e304f2cb Don't try to shift to a negative start time when shifting lines to frame zero
Originally committed to SVN as r6951.
2012-07-29 03:23:27 +00:00
Thomas Goyne ffe41cdf20 Don't discard frames which are decoded before the video display becomes visible
Originally committed to SVN as r6950.
2012-07-29 03:23:24 +00:00
Thomas Goyne 8c42f09235 Don't pass size_t to wxString::Format since there's no portable specifier for it
Originally committed to SVN as r6949.
2012-07-24 02:40:39 +00:00
Thomas Goyne 8ba149a7e6 Actually save the video zoom to the subtitles file
Originally committed to SVN as r6948.
2012-07-24 02:40:37 +00:00
Thomas Goyne 65d3c4cc2d Save keyframe and timecode file names even if video isn't loaded
Originally committed to SVN as r6947.
2012-07-24 02:40:34 +00:00
Thomas Goyne de7dd7e07f Use the video AR from the script rather than the video's AR when opening linked video
Originally committed to SVN as r6946.
2012-07-24 02:40:31 +00:00
Thomas Goyne 269a206053 Fix loading linked audio when automatic opening of audio from video is enabled
Originally committed to SVN as r6945.
2012-07-24 02:40:29 +00:00
cantabile 7bd7ef7cd6 Shift times: Make Enter in the time edit do the same as clicking OK
Originally committed to SVN as r6944.
2012-07-24 02:39:40 +00:00
cantabile 5ecb89eeec Shift times: Use TimeEdit::SetTime() instead of TimeEdit::SetValue()
TimeEdit::SetValue() will trigger TimeEdit::OnModified(), but that
doesn't always update the internal "time" property.
TimeEdit::OnModified() seems to be designed to handle editing the value
with the keyboard, not with SetValue().

Originally committed to SVN as r6943.
2012-07-24 02:39:37 +00:00
cantabile 3193e05747 Use correct format specifier in AssColor::GetSSAFormatted()
Avoids a ton of assertion failures when saving SSA files.

Originally committed to SVN as r6942.
2012-07-24 02:39:35 +00:00
cantabile ef65262920 SRTSubtitleFormat: don't mix line endings in non-Windows
Originally committed to SVN as r6941.
2012-07-24 02:39:32 +00:00
Thomas Goyne b2fb39b67f Fix leak of the Indexer when an audio/video file has already been indexed
Originally committed to SVN as r6940.
2012-07-23 00:44:47 +00:00
Thomas Goyne 11a4ede9a0 Add Layer to the things lines can be sorted by
Originally committed to SVN as r6939.
2012-07-23 00:44:44 +00:00
Thomas Goyne f3a935c985 Install all of the automation scripts
Originally committed to SVN as r6938.
2012-07-22 23:56:49 +00:00
Thomas Goyne ef3e75dbe9 Pass the row length rather than frame width to OpenGL for the unpack row length
Originally committed to SVN as r6937.
2012-07-21 03:50:38 +00:00
Thomas Goyne 556f0514c2 Fix crash in the Kanji timer when the source begins with whitespace and the dest is empty
Originally committed to SVN as r6936.
2012-07-21 03:50:35 +00:00
Thomas Goyne 291a4050d8 Fix manual path generation
Originally committed to SVN as r6935.
2012-07-14 16:54:15 +00:00
Thomas Goyne 1ff1a57bdc Regenerate aegisub.pot
Originally committed to SVN as r6934.
2012-07-14 16:54:12 +00:00
Thomas Goyne 38217c6c59 Implement the timing adjustment commands
Originally committed to SVN as r6933.
2012-07-14 13:35:15 +00:00
Thomas Goyne 60c38bd2e5 Fix potential crash when deleting lines with audio open
Don't assume that the active line is valid in RegenerateInactiveLines,
as it may get called by the commit signal before the selection is
updated when the active line is deleted.

Closes #1502.

Originally committed to SVN as r6932.
2012-07-08 23:22:27 +00:00
Thomas Goyne 5162c28684 Check for audio hotkeys in both key down and char hook
wx doesn't call the keyboard hook when a window has capture, which
results in hotkeys not working while a mouse button is held down. This
usually doesn't matter much, but in the audio display one might want to
play audio while moving a marker. In general checking for hotkeys in
keydown doesn't work, but in the specific cast of marker dragging
keyboard focus is guaranteed to be on the audio display so it works out.

Originally committed to SVN as r6931.
2012-07-08 23:22:25 +00:00
Thomas Goyne 4e53ab3eab Remove the uses of wxNumberFormatter
We currently require mismatched locales for non-English since we don't
distinguish between locale-independent things like the config file and
UI things, which wxNumberFormatter barfs on.

Originally committed to SVN as r6930.
2012-07-06 02:14:46 +00:00
Thomas Goyne 8244271508 Use curl to fetch updates on OS X
The update checker sometimes triggers crashes on startup on OS X when
trying to release the CFSocket, so hopefully sidestep whatever the issue
is by just using curl to retrieve the update list.

Originally committed to SVN as r6929.
2012-07-05 23:05:37 +00:00
Thomas Goyne 3dc9e4fbea Don't try to set the zoom dropdown selection if it'd be out of bounds
Originally committed to SVN as r6928.
2012-07-05 23:05:34 +00:00
Thomas Goyne 2fb6b19e45 Destroy the old video context when detaching video
It was previously not being destroyed until video was reattached, which
wasted VRAM and caused problems on OS X.

Originally committed to SVN as r6927.
2012-07-04 15:30:21 +00:00
Thomas Goyne f90d7a56fa Mostly rewrite the VideoDisplay sizing logic
Fixes layout errors after maximizing when the window previously wasn't
big enough to fit the video and an infinite loop caused by wxGTK not
updating the window size immediately.

Makes it so that the bottom video toolbar is not pushed offscreen by
high video zoom. This is not always desirable, but should be an
improvement in most cases.

Closes #1409.

Originally committed to SVN as r6926.
2012-07-04 15:30:16 +00:00
Thomas Goyne a7b254e95f Use the user's ffms2 error handling mode when indexing video files to avoid reindexing when opening the audio
Originally committed to SVN as r6925.
2012-06-30 15:27:11 +00:00
Thomas Goyne fbd0681d2a Use the translated text for submenus
Originally committed to SVN as r6924.
2012-06-27 01:44:38 +00:00
Thomas Goyne 7bb1e10736 Add Basque translation by Xabier Aramendi. Closes #1499.
Originally committed to SVN as r6923.
2012-06-27 01:44:33 +00:00
Thomas Goyne 400520daa4 Fix handling of \N, \n and \h in the fonts collector
Originally committed to SVN as r6922.
2012-06-26 01:50:41 +00:00
Thomas Goyne 33f475ff3a Put VSFilter in the CSRI directory and also include xy-vsfilter in 32-bit builds
Originally committed to SVN as r6921.
2012-06-25 14:21:39 +00:00
Thomas Goyne 67686b1ad8 Copy mo files directly from the po folder for the installer
Originally committed to SVN as r6920.
2012-06-25 14:21:36 +00:00
Thomas Goyne e945c02151 Fix some warnings
Originally committed to SVN as r6919.
2012-06-25 14:21:32 +00:00
Thomas Goyne e4e80b4d3d Add a configure check for the pch flags as clang doesn't support -fpch-deps
Originally committed to SVN as r6918.
2012-06-23 17:22:08 +00:00
Thomas Goyne 4129051684 Add license headers to libresrc.(h|cpp)
Originally committed to SVN as r6917.
2012-06-23 01:06:43 +00:00
Thomas Goyne ed070b7b6a Wrap standard headers in libresrc.h with #ifndef AGI_PRE
Originally committed to SVN as r6916.
2012-06-23 01:06:40 +00:00
Thomas Goyne 257e25eb0e Make libresrc_getconfig less weird
Originally committed to SVN as r6915.
2012-06-23 01:06:38 +00:00
Thomas Goyne e99b1aaad4 Remove some pointess stuff in the icon code
Originally committed to SVN as r6914.
2012-06-23 01:06:35 +00:00
Thomas Goyne bfa3aba654 Don't try to use wxFileName::Exists with wx 2.9.3. Closes #1500.
Originally committed to SVN as r6913.
2012-06-23 01:06:32 +00:00
Thomas Goyne fd017b52ac Fix incorrectly positioned controls in the fonts collector dialog
The documentation claims that making things in static boxes children of
the static box is the right thing to do, but it's broken things a few
times now, so just make them children of the static box's parent.

Originally committed to SVN as r6912.
2012-06-21 04:32:10 +00:00
Thomas Goyne 7d2fb49828 Make the update checker configurable
Move the server and base url to the build-time configuration options and make
it disablable entirely.

Originally committed to SVN as r6911.
2012-06-21 02:09:40 +00:00
Thomas Goyne 87370eb9c0 Fix crash when clicking in the screen dropper area on Windows
Originally committed to SVN as r6910.
2012-06-17 20:22:38 +00:00
Thomas Goyne 9f7bdd8d17 Don't force ffms2 threads to 1 if it's recent enough
Originally committed to SVN as r6909.
2012-06-16 04:10:32 +00:00
Thomas Goyne 77821c10b7 Don't also force TV range when Force BT.601 is enabled
Originally committed to SVN as r6908.
2012-06-15 13:09:15 +00:00
cantabile 5ea71bce89 HD audio cache: initialise variables before checking for free space
Originally committed to SVN as r6907.
2012-06-15 13:08:45 +00:00
cantabile d99f3e3841 Fix missing ending slash in the HD cache file's location
Given the location "/home/asdf/.aegisub" and name "audio%02i.tmp",
the cache file was ".aegisubaudio00.tmp" in "/home/asdf"...

Originally committed to SVN as r6906.
2012-06-15 13:08:41 +00:00
cantabile 67c05519fa Allow the use of standard paths in the HD cache file's location
Originally committed to SVN as r6905.
2012-06-15 13:08:39 +00:00
Thomas Goyne b8c6a41ac4 Add support for floating-point audio. Closes #1490.
Originally committed to SVN as r6904.
2012-06-13 15:58:28 +00:00
Thomas Goyne 5eb14a1f7a Maybe really fix hurr durr gtk. Closes #1474.
Originally committed to SVN as r6903.
2012-06-13 15:58:24 +00:00
Thomas Goyne 05f63f14b2 Log which audio provider is actually used
Originally committed to SVN as r6902.
2012-06-13 15:58:21 +00:00
Thomas Goyne d4635b723a Support wx built with utf-32 strings
Originally committed to SVN as r6901.
2012-06-13 04:16:53 +00:00
Thomas Goyne 7c461ddfcf Use size_t rather than int64_t as the array index in AudioProvider::GetAudioWithVolume
In 32-bit builds the int64_t index resulted in two (inlined) calls to
allmul per audio sample, which took 25-50% of the total CPU time
involved in playing audio from the RAM cache.

Originally committed to SVN as r6900.
2012-06-13 04:16:50 +00:00
Thomas Goyne 998fc633b9 osx: Fix assertion failure when expanding hotkey categories
Originally committed to SVN as r6899.
2012-06-12 03:13:58 +00:00
Thomas Goyne 2db20778fc Mostly rewrite the screen dropper code
Eliminate a lot of the platform-specific code by just using the portable
versions everywhere, and use CoreGraphics rather than wxScreenDC to grab
an image of the screen on OS X as wxScreenDC doesn't actually work on
10.6+.

Originally committed to SVN as r6898.
2012-06-12 03:13:55 +00:00
Thomas Goyne 82d955ba96 Exit on error in osx-run.sh
Originally committed to SVN as r6897.
2012-06-12 03:13:53 +00:00
Thomas Goyne 0f071d978a Rewrite the OS X bundle utils in Obj-C++ and return std::strings rather than malloced char *
Originally committed to SVN as r6896.
2012-06-12 03:13:49 +00:00
cantabile 4b78e05695 Video box: tweak the tab order
Move the slider before the buttons,
and move the video display before the slider.

Originally committed to SVN as r6895.
2012-06-12 02:59:41 +00:00
cantabile 46c83d7f1c Allow tabbing out of the video slider
Originally committed to SVN as r6894.
2012-06-12 02:59:38 +00:00
cantabile acea3a04e0 Make run.sh work regardless of $PWD.
Originally committed to SVN as r6893.
2012-06-12 02:59:35 +00:00
Thomas Goyne 03b1b8e1c0 Flush options before restarting so that language changes actually apply
Originally committed to SVN as r6892.
2012-06-08 21:20:21 +00:00
Thomas Goyne a51de67d68 ffms2: Reindex and reload audio when the error handling mode is changed
Originally committed to SVN as r6891.
2012-06-07 21:03:11 +00:00
Thomas Goyne 8c17d45e8c osx: Move the detached video dialog to the normal window level when it goes fullscreen as it's hilariously broken otherwise
Originally committed to SVN as r6890.
2012-06-07 21:03:08 +00:00
Thomas Goyne f0f7ad2858 osx: Make modelss dialogs stay on top of the main window as they're floating panels, not documents
Originally committed to SVN as r6889.
2012-06-07 02:48:13 +00:00
Thomas Goyne 26a5fbe4b8 osx: Add the full screen button to the detached video dialog
Originally committed to SVN as r6888.
2012-06-07 02:48:11 +00:00
Thomas Goyne b65e867455 Enable the Accept Splits button even when it's only the autosplit that would be committed
Originally committed to SVN as r6887.
2012-06-07 02:48:08 +00:00
Thomas Goyne 18041eabc7 Use * rather than \+ in osx-bundle.sed since the latter has magically stopped working
Originally committed to SVN as r6886.
2012-06-07 02:48:05 +00:00
Thomas Goyne c6237865af Unconditionally add -lz to WX_LIBS
Originally committed to SVN as r6885.
2012-05-28 15:00:54 +00:00
Thomas Goyne 9cb5178c4b Revert r6758
The explicit cast should not be required, and the type of the parameter
has changed between wx versions so it breaks things.

Originally committed to SVN as r6884.
2012-05-28 14:55:42 +00:00
Thomas Goyne 108c38b9bc Don't swallow : keypresses in TimeEdit
Originally committed to SVN as r6883.
2012-05-28 14:18:40 +00:00
cantabile a3d7d2bbc0 TimeEdit: handle Shift-Insert the same way as Ctrl-V
Shift-Insert pasted the text anyway, but without anyone "noticing",
which meant the TimeEdit's internal variable "time" didn't get updated,
causing TimeEdit::GetTime() to return the old time. Because of this,
pasting a time in the Jump To dialog with Shift-Insert didn't update the
frame number.

Originally committed to SVN as r6882.
2012-05-28 14:18:10 +00:00
cantabile 3a81e80aa5 Add workaround for tabbing out of SubsTextEditCtrl
wxStyledTextCtrl eats the tabs, so handle them in
SubsTextEditCtrl::OnKeyDown()

Originally committed to SVN as r6881.
2012-05-28 14:18:07 +00:00
Thomas Goyne 571752a955 Make the visual typesetting toolbar use all available space
When toolbars actually have a background (as on OS X), the stretch
spacer was very ugly, and there's no different on platforms without a
background.

Originally committed to SVN as r6880.
2012-05-26 20:16:12 +00:00
Thomas Goyne cde9a34425 osx: Add the full screen button to the main window
Originally committed to SVN as r6879.
2012-05-26 20:16:08 +00:00
Thomas Goyne 1da7502d6e Remove pointless commented-out code
Originally committed to SVN as r6878.
2012-05-26 20:16:05 +00:00
Thomas Goyne ae672b64af Add Objective-C++ support to the makefile
Originally committed to SVN as r6877.
2012-05-26 20:16:02 +00:00
Thomas Goyne dc5d6c9a4a Add missing include in unix/log.cpp and wrap includes in #ifndef LAGI_PRE
Originally committed to SVN as r6876.
2012-05-26 17:00:16 +00:00
Thomas Goyne 427c8406d5 hurr durr gtk. Closes #1474.
Originally committed to SVN as r6875.
2012-05-26 16:54:55 +00:00
Thomas Goyne a75c8705bb Make bitmap.{h,cpp} depend on their input files
Originally committed to SVN as r6874.
2012-05-26 16:54:52 +00:00
Thomas Goyne e4154b1ae0 Don't include the version in the automation install path. Closes #1493.
Originally committed to SVN as r6873.
2012-05-26 16:54:48 +00:00
Thomas Goyne 1206906c32 Automatically generate the list of supported languages rather than hardcoding it
Originally committed to SVN as r6845.
2012-05-24 01:53:56 +00:00
Thomas Goyne a6036d98f1 Fix copyright years and URL in the plist
Originally committed to SVN as r6844.
2012-05-24 01:53:53 +00:00
Thomas Goyne 29e9d09859 Fix non-precompiled-header compilation
Originally committed to SVN as r6843.
2012-05-23 03:38:50 +00:00
Thomas Goyne 11747a6c27 Regenerate aegisub.pot
Originally committed to SVN as r6842.
2012-05-23 03:38:47 +00:00
Thomas Goyne c6aa43de72 Add command audio/play/current
This is like audio/play/selection except it ignores changes to the
primary range during playback, and always stops when the original end of
the line is reached.

Originally committed to SVN as r6841.
2012-05-23 03:38:44 +00:00
Thomas Goyne 567549c55d OS X: Add default hotkey to show/hide toolbar
Originally committed to SVN as r6840.
2012-05-23 03:38:41 +00:00
Thomas Goyne 58de109085 Add Show/Hide toolbar to the View menu
The Apple HIG says to include this, and I see no reason not to include
it on the other platforms as well.

Originally committed to SVN as r6839.
2012-05-23 03:38:37 +00:00
Thomas Goyne b9154a79c1 Also extract strings from the OS X default menu
Originally committed to SVN as r6838.
2012-05-23 03:38:34 +00:00
Thomas Goyne 24cd2bbdf9 Fix the name of the quit command
Originally committed to SVN as r6837.
2012-05-19 16:22:21 +00:00
Thomas Goyne 9f9e273de2 Compress the dmg with bzip2 rather than zlib
Reduces size by ~7%.

Originally committed to SVN as r6836.
2012-05-19 16:22:16 +00:00
Thomas Goyne 35279b6e28 Remove pointless blank buttons
Originally committed to SVN as r6835.
2012-05-19 15:49:23 +00:00
Thomas Goyne e4cc9d1404 OX X: Force 32x32 toolbar icons rather than 24x24
Originally committed to SVN as r6834.
2012-05-19 15:49:18 +00:00