/*****************************************************************************
* TrackSynchronization.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2011 VideoLAN
- * Copyright (C) 2011 Felix Paul Kühne
+ * Copyright (C) 2011-2012 VLC authors and VideoLAN
+ * Copyright (C) 2011-2012 Felix Paul Kühne
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#import "CompatibilityFixes.h"
#import "intf.h"
+#import "VideoEffects.h"
#import <vlc_common.h>
#import "TrackSynchronization.h"
+#define SUBSDELAY_CFG_MODE "subsdelay-mode"
+#define SUBSDELAY_CFG_FACTOR "subsdelay-factor"
+#define SUBSDELAY_MODE_ABSOLUTE 0
+#define SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY 1
+#define SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT 2
+
@implementation VLCTrackSynchronization
static VLCTrackSynchronization *_o_sharedInstance = nil;
[o_window setTitle:_NS("Track Synchronization")];
[o_reset_btn setTitle:_NS("Reset")];
[o_av_lbl setStringValue:_NS("Audio/Video")];
- [o_av_advance_lbl setStringValue: _NS("Advance of audio over video:")];
+ [o_av_advance_lbl setStringValue: _NS("Audio track synchronization:")];
[[o_av_value_fld formatter] setFormat:[NSString stringWithFormat:@"#,##0.000 %@", _NS("s")]];
[o_av_value_fld setToolTip: _NS("A positive value means that the audio is ahead of the video")];
[o_sv_lbl setStringValue: _NS("Subtitles/Video")];
- [o_sv_advance_lbl setStringValue: _NS("Advance of subtitles over video:")];
+ [o_sv_advance_lbl setStringValue: _NS("Subtitle track syncronization:")];
[[o_sv_advance_value_fld formatter] setFormat:[NSString stringWithFormat:@"#,##0.000 %@", _NS("s")]];
[o_sv_advance_value_fld setToolTip: _NS("A positive value means that the subtitles are ahead of the video" )];
- [o_sv_speed_lbl setStringValue: _NS("Speed of the subtitles:")];
+ [o_sv_speed_lbl setStringValue: _NS("Subtitles speed:")];
[[o_sv_speed_value_fld formatter] setFormat:[NSString stringWithFormat:@"#,##0.000 %@", _NS("fps")]];
+ [o_sv_dur_lbl setStringValue: _NS("Subtitles duration factor:")];
+
+ int i_mode = var_InheritInteger( p_intf, SUBSDELAY_CFG_MODE );
+ NSString * o_toolTip, * o_suffix;
+
+ switch (i_mode)
+ {
+ default:
+ case SUBSDELAY_MODE_ABSOLUTE:
+ o_toolTip = _NS("Extend subtitles duration by this value.\nSet 0 to disable.");
+ o_suffix = @" s";
+ break;
+ case SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY:
+ o_toolTip = _NS("Multiply subtitles duration by this value.\nSet 0 to disable.");
+ o_suffix = @"";
+ break;
+ case SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT:
+ o_toolTip = _NS("Recalculate subtitles duration according\nto their content and this value.\nSet 0 to disable.");
+ o_suffix = @"";
+ break;
+ }
+
+ [[o_sv_dur_value_fld formatter] setFormat:[NSString stringWithFormat:@"#,##0.000%@", o_suffix]];
+ [o_sv_dur_value_fld setToolTip: o_toolTip];
+
+ if (OSX_LION)
+ [o_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
[self resetValues:self];
}
[o_av_value_fld setFloatValue:0.0];
[o_sv_advance_value_fld setFloatValue:0.0];
[o_sv_speed_value_fld setFloatValue:1.0];
+ [o_sv_dur_value_fld setFloatValue:0.0];
+ [o_av_stp setFloatValue:0.0];
+ [o_sv_advance_stp setFloatValue:0.0];
+ [o_sv_speed_stp setFloatValue:1.0];
+ [o_sv_dur_stp setFloatValue:0.0];
input_thread_t * p_input = pl_CurrentInput( p_intf );
if( p_input )
{
-
var_SetTime( p_input, "audio-delay", 0.0 );
var_SetTime( p_input, "spu-delay", 0.0 );
var_SetFloat( p_input, "sub-fps", 1.0 );
+ [self svDurationValueChanged:nil];
vlc_object_release( p_input );
}
}
-- (IBAction)avValueChanged:(id)sender
+- (void)updateValues
{
- if( sender == o_av_minus_btn )
- [o_av_value_fld setFloatValue: [o_av_value_fld floatValue] - 0.5];
+ input_thread_t * p_input = pl_CurrentInput( p_intf );
+
+ if( p_input )
+ {
+ [o_av_value_fld setDoubleValue: var_GetTime( p_input, "audio-delay" ) / 1000000.];
+ [o_sv_advance_value_fld setDoubleValue: var_GetTime( p_input, "spu-delay" ) / 1000000.];
+ [o_sv_speed_value_fld setFloatValue: var_GetFloat( p_input, "sub-fps" )];
+ vlc_object_release( p_input );
+ }
+ [o_av_stp setDoubleValue: [o_av_value_fld doubleValue]];
+ [o_sv_advance_stp setDoubleValue: [o_sv_advance_value_fld doubleValue]];
+ [o_sv_speed_stp setDoubleValue: [o_sv_speed_value_fld doubleValue]];
+}
- if( sender == o_av_plus_btn )
- [o_av_value_fld setFloatValue: [o_av_value_fld floatValue] + 0.5];
+- (IBAction)avValueChanged:(id)sender
+{
+ if( sender == o_av_stp )
+ [o_av_value_fld setDoubleValue: [o_av_stp doubleValue]];
+ else
+ [o_av_stp setDoubleValue: [o_av_value_fld doubleValue]];
input_thread_t * p_input = pl_CurrentInput( p_intf );
if( p_input )
{
- int64_t i_delay = [o_av_value_fld floatValue] * 1000000;
- var_SetTime( p_input, "audio-delay", i_delay );
+ var_SetTime( p_input, "audio-delay", [o_av_value_fld doubleValue] * 1000000. );
vlc_object_release( p_input );
}
- (IBAction)svAdvanceValueChanged:(id)sender
{
- if( sender == o_sv_advance_minus_btn )
- [o_sv_advance_value_fld setFloatValue: [o_sv_advance_value_fld floatValue] - 0.5];
-
- if( sender == o_sv_advance_plus_btn )
- [o_sv_advance_value_fld setFloatValue: [o_sv_advance_value_fld floatValue] + 0.5];
+ if( sender == o_sv_advance_stp )
+ [o_sv_advance_value_fld setDoubleValue: [o_sv_advance_stp doubleValue]];
+ else
+ [o_sv_advance_stp setDoubleValue: [o_sv_advance_value_fld doubleValue]];
input_thread_t * p_input = pl_CurrentInput( p_intf );
if( p_input )
{
- int64_t i_delay = [o_sv_advance_value_fld floatValue] * 1000000;
- var_SetTime( p_input, "spu-delay", i_delay );
+ var_SetTime( p_input, "spu-delay", [o_sv_advance_value_fld doubleValue] * 1000000. );
vlc_object_release( p_input );
}
- (IBAction)svSpeedValueChanged:(id)sender
{
- if( sender == o_sv_speed_minus_btn )
- [o_sv_speed_value_fld setFloatValue: [o_sv_speed_value_fld floatValue] - 0.5];
-
- if( sender == o_sv_speed_plus_btn )
- [o_sv_speed_value_fld setFloatValue: [o_sv_speed_value_fld floatValue] + 0.5];
+ if( sender == o_sv_speed_stp )
+ [o_sv_speed_value_fld setFloatValue: [o_sv_speed_stp floatValue]];
+ else
+ [o_sv_speed_stp setFloatValue: [o_sv_speed_value_fld floatValue]];
input_thread_t * p_input = pl_CurrentInput( p_intf );
if( p_input )
{
- var_SetFloat( p_input, "sub-fps", [o_av_value_fld floatValue] );
+ var_SetFloat( p_input, "sub-fps", [o_sv_speed_value_fld floatValue] );
vlc_object_release( p_input );
}
}
-- (void)controlTextDidChange:(NSNotification *)aNotification
+- (IBAction)svDurationValueChanged:(id)sender
{
- if( [aNotification object] == o_av_value_fld )
- [self avValueChanged:self];
- else if( [aNotification object] == o_sv_advance_value_fld )
- [self svAdvanceValueChanged:self];
- else if( [aNotification object] == o_sv_speed_value_fld )
- [self svSpeedValueChanged:self];
+ if( sender == o_sv_dur_stp )
+ [o_sv_dur_value_fld setFloatValue: [o_sv_dur_stp floatValue]];
+ else
+ [o_sv_dur_stp setFloatValue: [o_sv_dur_value_fld floatValue]];
+
+ input_thread_t * p_input = pl_CurrentInput( p_intf );
+
+ if( p_input )
+ {
+ float f_factor = [o_sv_dur_value_fld floatValue];
+ config_PutFloat( p_intf, SUBSDELAY_CFG_FACTOR, f_factor );
+
+ /* Try to find an instance of subsdelay, and set its factor */
+ vlc_object_t *p_obj = ( vlc_object_t * ) vlc_object_find_name( p_intf->p_libvlc, "subsdelay" );
+ if( p_obj )
+ {
+ var_SetFloat( p_obj, SUBSDELAY_CFG_FACTOR, f_factor );
+ vlc_object_release( p_obj );
+ }
+ [[VLCVideoEffects sharedInstance] setVideoFilter: "subsdelay" on: f_factor > 0];
+
+ vlc_object_release( p_input );
+ }
}
@end
projects / vlc / blobdiff