summaryrefslogtreecommitdiffstats
path: root/macosx/HBSubtitles.m
Commit message (Collapse)AuthorAgeFilesLines
* MacGui: do not load a job from disk if one or more job objects are missing.Damiano Galassi2017-04-211-1/+4
|
* MacGui: do not duplicate the subtitle source track each time the job is read ↵Damiano Galassi2017-03-171-1/+1
| | | | again from disk.
* subtitles: simplify and shorten subtitle descriptions (#591)John Stebbins2017-03-101-22/+1
| | | | | | | | | | | | | | | | | | * subtitles: simplify and shorten subtitle descriptions Generally, it eliminates parens to make things more readable. I.e. it turns this: English (Closed Caption)(Wide Screen)(Bitmap)(VOBSUB) Into this: English, Closed Caption [Wide Screen, VOBSUB] * Revise punctuation per BradleyS request * fix subtitle description formatting * incorporate suggestions from PR
* MacGui: improve management of security scoped resources. Fix external SRT in ↵Damiano Galassi2017-01-251-4/+83
| | | | the sandboxed build.
* MacGui: fix NSSecureCoding for the HBSubtitles class.Damiano Galassi2017-01-041-1/+1
|
* MacGui: enable NSSecureCoding for the queue file.Damiano Galassi2016-12-271-3/+3
|
* MacGui: fix audio and subtitles tracks when reloading a job from the queue.Damiano Galassi2016-12-271-8/+10
|
* MacGui: set the subtitles track default key when applying defaults from a ↵Damiano Galassi2016-12-241-0/+1
| | | | preset.
* MacGui: fix HBJob copy method, plus small performance optimisation in ↵Damiano Galassi2016-11-021-21/+36
| | | | HBAudio and HBSubtitles.
* MacGui: made some HBJob properties private.Damiano Galassi2016-10-311-1/+4
|
* MacGui: use hb_preset_job_init instead of custom logic for audio, subtitles ↵Damiano Galassi2016-10-291-117/+28
| | | | and picture job settings.
* MacGui: use an pair of 'OK' and 'Cancel' buttons in the defaults sheets ↵Damiano Galassi2015-10-291-0/+10
| | | | instead of a single done button. Fixed the bitrates and mixdowns popups in the audio defaults.
* MacGui: improve subtitles defaults undo support.Damiano Galassi2015-10-241-0/+1
|
* MacGui: rewrote the subtitles tab to use bindings, view-based table view and ↵Damiano Galassi2015-10-221-247/+262
| | | | to support undo/redo.
* MacGui: remove some HBPreset -> NSDictionary conversions and add a mutable ↵Damiano Galassi2015-10-131-2/+2
| | | | version of HBPreset.
* MacGui: split HBTitle header to make it easier to test. Added some simple tests.ritsuka2015-06-011-0/+2
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7256 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: implemented the NSSecureCoding protocol in HBJob. Added a ↵ritsuka2015-04-221-5/+10
| | | | | | compatibility class to fall back on NSCoding on 10.7 and earlier. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7112 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: run the Xcode "convert to modern objective-c" on the entire project.ritsuka2015-04-091-1/+1
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7075 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: convert the mac gui to Objective-C ARC.ritsuka2015-03-171-26/+7
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6996 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: add Burn-In options to subtitle defaults hopefully similar to the ↵ritsuka2015-02-171-4/+57
| | | | | | LinGui. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6916 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: fix an issue where a "none" track could be added to hb_job_t.ritsuka2015-01-311-1/+1
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6841 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: do a mutable copy instead of a copy for the masterTrackArray.ritsuka2015-01-211-1/+1
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6783 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: fix some leaksritsuka2015-01-151-2/+19
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6753 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: fix a crash when editing a queue item.ritsuka2015-01-131-0/+3
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6745 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Move the audio/subtitles selection logic out of the view ↵ritsuka2015-01-131-0/+497
| | | | | | controllers. Now it's possible to create a HBJob and apply a preset to without the UI classes help. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6741 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGUI: Refactored the controller code for the ↵ritsuka2014-07-151-863/+0
| | | | | | | | | | video/audio/subtitles/chapters view: Added a xib file and a NSViewController subclass for each tab of the main HandBrake window. Each view controller now to responds to the HBContainerChangedNotification and HBTitleChangedNotification notifications instead of using a custom way to notify changes. Converted the modified .xibs to the Xcode 5.1 format. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6231 b64f7644-9d1e-0410-96f1-a4d463321fa5
* libhb: enable burn-in of all supported text subtitle formatsjstebbins2014-03-301-107/+80
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6141 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGUI: Varius warnings fixes:ritsuka2013-10-251-4/+4
| | | | | | | | | | - NSUInteger and NSInteger instead of int (where the Cocoa 64bit api uses them). - Cast to int when needed because NSInteger on 64bit is defined as long. - NSURL instead of NSString when possible. - Replaced some deprecated methods/functions. - numberWithInteger instead of numberWithInt. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5854 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGUI: fixed a number of leaks/null-deferences/dead-code found by clang ↵ritsuka2013-10-151-66/+65
| | | | | | static analyzer. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5838 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: populate the SRT subtitle language list dynamically from libhb.Rodeo2013-07-131-187/+13
| | | | | | | | Adds several languages that were previously missing from the list. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5645 b64f7644-9d1e-0410-96f1-a4d463321fa5
* Don't expose rate, mixdown, dither and encoder arrays to the UIs.Rodeo2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | - instead, make these lists available through enumerators: --> hb_*_get_next(<type> *last); - this should give us more flexibility to populate the lists at runtime, using the implementation(s) of our choice, whether they use arrays or not, without requiring UI modifications - use consistent naming for getters --> hb_get_best_foo() becomes hb_foo_get_best(), and so on - hb_*_get_from_name() and hb_*_ sanitize_name() sanitize the requested value to a supported one if it's unavailable - adds an additional, passthru-specific fallback mechanism - adds a list of video containers git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5526 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: stop before the last ("None") subtitle track when converting ↵Rodeo2013-05-121-3/+5
| | | | | | | | | | | | incompatible tracks to burn-in. We were calling [[tempObject objectForKey:@"subtitleSourceTrackType"] intValue], so for "None", [nil intValue], which was returning 0. As it turns out, VOBSUB == 0 thus hb_subtitle_can_pass() was true out of sheer luck. In a case where e.g. hb_subtitle_can_pass(VOBSUB, mux) is false (such as with the upcoming HB_MUX_AV_MP4 muxer), the None track would actually be deleted! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5453 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: forbid including passthru PGS subtitle streams in MP4.Rodeo2013-03-121-78/+194
| | | | | | | | | | | | When adding a PGS track and the container is MP4, the track is automatically set to burned-in. When adding an additional PGS track and the container is MP4, the track is removed and an alert dialog is displayed. When switching from MKV to MP4, the first PGS track is converted to burned-in (any non-PGS track that was set to burned-in is reset to passthru) and additional tracks are removed; an alert dialog is also displayed. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5325 b64f7644-9d1e-0410-96f1-a4d463321fa5
* PGS (bluray) subtitle support \o/jstebbins2012-04-261-13/+7
| | | | | | | | | | | | Thanks to patches supplied by David Mitchell and Rob McMullen we finally have PGS support. I added a fix for libav pgs timestamp processing and detection of forced subtitles to their work, then made foreign audio search work with PGS subs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4605 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Subtitle tab changesdynaflash2010-11-011-102/+89
| | | | | | | | | | - Patch by Rodeo ... Thanks! - displays additional information about source subtitles (VOBSUB, SSA, etc. in addition to Text/Bitmap). - disables the "Forced Only" checkbox for non-VOBSUB tracks. - makes "Forced Only" the default for Foreign Language Search. - makes the "Default" and "Burned In" checkboxes mutually exclusive (the checkboxes act like a radio button). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3635 b64f7644-9d1e-0410-96f1-a4d463321fa5
* SSA subtitle burn injstebbins2010-09-281-6/+35
| | | | | | | | | | Anime fans rejoice! This patch adds SSA subtitle burn-in support with libass. Therefore SSA subtitles should now be rendered in full quality, with the appropriate embedded fonts and positioning information. Thanks to davidfstr git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3557 b64f7644-9d1e-0410-96f1-a4d463321fa5
* Macgui: Sanity check multiple burned in vobsubs.dynaflash2010-05-261-3/+21
| | | | git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3328 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Enable soft vobsubs in mp4dynaflash2010-05-251-51/+5
| | | | | | | | | - Initial patch by Rodeo. Thanks Rodeo! - Enables soft vobsubsin macgui as per http://trac.handbrake.fr/changeset/3325 - Due to the fact that currently no quicktime based playback devices (yes, including computers and iphone/ipod/ipad) supports soft vobsubs, "Burned In" is on by default. - Currently soft vobsubs are shown as supported by VLC (Lunettes) and Mplayer on the mac platform. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3326 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Queued item editing initial implementation.dynaflash2010-01-211-1/+47
| | | | | | | | | - Sends a chosen queued item back to the main window for reload ( and rescan ) via contextual menu (right click) - Deletes queued item from queue after being reloaded to main window ( after editing or whatever, send back to queue via Add To Queue Button same as a new source). - New queue window contextual menu also includes delete and show options previously only available via separate icons. - Note: Needs testing particularly in the subtitle area, which is not to say there aren't other bugs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3080 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Fix issue with subtitle changes affecting all encodes in the queue ↵dynaflash2009-12-101-1/+1
| | | | | | | | by being less stupid. - Thanks to Rodeo for bringing it to my attention. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3024 b64f7644-9d1e-0410-96f1-a4d463321fa5
* Macgui: fix issue where choosing an srt subtitle file would fail to ↵dynaflash2009-10-071-0/+4
| | | | | | autmatically enable the appropriate srt subtitle widgets. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2873 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Subtitles - fix bug that prevented being able to select burned in ↵dynaflash2009-07-171-1/+1
| | | | | | subtitles. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2701 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: remove broken conditional that was errantly included in srt subtitle ↵dynaflash2009-07-161-10/+0
| | | | | | initial implementation. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2700 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: srt subtitle support initial implementationdynaflash2009-07-161-71/+547
| | | | | | | | | - Allows adding an external srt sub file as a subtitle source. -- Adds fields for srt language, char code and offset in ms. - Known issues: adding the srt file to the sources list also adds a new subtitle track for that source, however to "set" it you have to click on it. - srt subtitles do not seem to work in preview even if set to default. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2699 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Subtitles - Fix bug where setting the first track to None ( deleting ↵dynaflash2009-06-161-45/+50
| | | | | | | | the previously selected track) cause the next track to be set to one subtitle track less than it should (thanks for the heads up Rodeo). - Also removed a needless bit of boolean logic used to test mp4 multi vobsub removal. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2539 b64f7644-9d1e-0410-96f1-a4d463321fa5
* MacGui: Multiple subtitle tracks initial implementationdynaflash2009-06-131-0/+444
- Subtitles now get their own tab - "None" track is an empty track, add a new subtitle track by switching it to a valid source track. - First track allows for "Foreign Language Search" which replaces the old "Auto Select". - Remove a previously selected track by setting it back to "None" - Sanity Checks: -- Allow only one Burned In track. -- Text tracks do not allow burned in to be set. -- MP4 specific: --- Allow only one VobSub and force burned in to be set. ---- Trying to set more than one vobsub in mp4 results in a warning, and the first vobsub track is retained. - Presets: Currently subtitles are not recorded into presets (which they never have been). - Live Preview: -- Foreign Language Search is borked for live preview, so is ignored -- Burned in subtitles work for both mp4 and mkv -- Text subtitles work for mp4 if set to default (preview has no way to turn soft subs on/off) -- Text subtitles do not show up in preview window even if checked as default. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2530 b64f7644-9d1e-0410-96f1-a4d463321fa5