From 2d8ef3b23597fd7178e446d5279ff3093f4839b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 18 May 2014 19:21:34 +0200 Subject: [PATCH] macosx: don't continue playback where left off if user set a custom start-time --- modules/gui/macosx/playlist.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 9588a4bc1e98..217f82a0ad6a 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1479,6 +1479,14 @@ - (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread if (!p_item) return; + /* allow the user to over-write the start-time */ + if (p_item->i_options > 0) { + for (int x = 0; x < p_item->i_options; x++) { + if (strstr(p_item->ppsz_options[x],"start-time")) + return; + } + } + char *psz_url = decode_URI(input_item_GetURI(p_item)); NSString *url = [NSString stringWithUTF8String:psz_url ? psz_url : ""]; free(psz_url); @@ -1491,7 +1499,7 @@ - (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread long long int dur = input_item_GetDuration(p_item) / 1000000; int current_pos_in_sec = (f_current_pos * dur) / 100; - if (current_pos_in_sec == 0 || current_pos_in_sec >= lastPosition.intValue) + if (current_pos_in_sec >= lastPosition.intValue) return; int settingValue = config_GetInt(VLCIntf, "macosx-continue-playback");