[vlc-commits] [Git][videolan/vlc][3.0.x] macosx/prefs: always show media key control as enabled
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
08db536c by Felix Paul Kühne at 2021-06-16T13:53:41+02:00
macosx/prefs: always show media key control as enabled
On macOS Sierra and higher, we will use the official API to enable
control of VLC, which will always be enabled as potential conflicts are
mitigated by the OS and it is possible to control more than one
application at the same time, so the option is ignored. On earlier
releases of macOS, SPMediaKeyTap can still be optionally disabled.
- - - - -
1 changed file:
- modules/gui/macosx/VLCSimplePrefsController.m
Changes:
=
modules/gui/macosx/VLCSimplePrefsController.m
=
@@ -565,7 +565,12 @@ static inline const char * __config_GetLabel(vlc_object_t
*p_this, const char *p
[self setupButton:_intf_appleremoteCheckbox forBoolValue:
"macosx-appleremote"];
[self setupButton:_intf_appleremote_sysvolCheckbox forBoolValue:
"macosx-appleremote-sysvol"];
[self setupButton:_intf_statusIconCheckbox forBoolValue:
"macosx-statusicon"];
-[self setupButton:_intf_mediakeysCheckbox forBoolValue:
"macosx-mediakeys"];
+if (OSX_SIERRA_AND_HIGHER) {
+_intf_mediakeysCheckbox.enabled = NO;
+_intf_mediakeysCheckbox.intValue = YES;
+} else {
+[self setupButton:_intf_mediakeysCheckbox forBoolValue:
"macosx-mediakeys"];
+}
[self setupButton:_video_nativeFullscreenCheckbox forBoolValue:
"macosx-nativefullscreenmode"];
[self setupButton:_video_embeddedCheckbox forBoolValue: "embedded-video"];
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/08db536c9921b0b5654bc954e335051efa1130c1
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/08db536c9921b0b5654bc954e335051efa1130c1
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] set Snap compression to LZO
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: c7f6b93b by Tim L at 2021-06-16T16:07:49+00:00 set Snap compression to LZO - - - - - 1 changed file: - extras/package/snap/snapcraft.yaml Changes: = extras/package/snap/snapcraft.yaml = @@ -10,6 +10,7 @@ description: | VCDs, and various streaming protocols. NOTE. This snap contains an untested daily build of VLC confinement: strict +compression: lzo apps: vlc: View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c7f6b93b16cba5a86ff499fb5d101f73d5e61ea8 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/c7f6b93b16cba5a86ff499fb5d101f73d5e61ea8 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] vout: remove Thread and ThreadDisplay prefixes
Romain Vimont pushed to branch master at VideoLAN / VLC
Commits:
7c8beb2f by Romain Vimont at 2021-06-16T14:29:20+00:00
vout: remove Thread and ThreadDisplay prefixes
Some static functions were named with prefixes. For unknown reasons,
there were two different prefixes (Thread and ThreadDisplay).
Their usage is confusing, because these functions could be called either
from Thread() (the vout thread) or from another thread. For example,
vout_NextPicture() is called from the decoder thread, and it calls
ThreadDisplayPicture(), which itself calls many of the other prefixed
functions.
To avoid confusion (and for simplicity), remove these prefixes.
- - - - -
1 changed file:
- src/video_output/video_output.c
Changes:
=
src/video_output/video_output.c
=
@@ -780,19 +780,19 @@ static int FilterRestartCallback(vlc_object_t *p_this,
char const *psz_var,
return 0;
}
-static int ThreadDelFilterCallbacks(filter_t *filter, void *opaque)
+static int DelFilterCallbacks(filter_t *filter, void *opaque)
{
filter_DelProxyCallbacks((vlc_object_t*)opaque, filter,
FilterRestartCallback);
return VLC_SUCCESS;
}
-static void ThreadDelAllFilterCallbacks(vout_thread_sys_t *vout)
+static void DelAllFilterCallbacks(vout_thread_sys_t *vout)
{
vout_thread_sys_t *sys = vout;
assert(sys->filter.chain_interactive != NULL);
filter_chain_ForEach(sys->filter.chain_interactive,
- ThreadDelFilterCallbacks, vout);
+ DelFilterCallbacks, vout);
}
static picture_t *VoutVideoFilterInteractiveNewPicture(filter_t *filter)
@@ -820,7 +820,7 @@ static picture_t *VoutVideoFilterStaticNewPicture(filter_t
*filter)
return picture_NewFromFormat(>fmt_out.video);
}
-static void ThreadFilterFlush(vout_thread_sys_t *sys, bool is_locked)
+static void FilterFlush(vout_thread_sys_t *sys, bool is_locked)
{
if (sys->displayed.current)
{
@@ -841,11 +841,11 @@ typedef struct {
config_chain_t *cfg;
} vout_filter_t;
-static void ThreadChangeFilters(vout_thread_sys_t *vout)
+static void ChangeFilters(vout_thread_sys_t *vout)
{
vout_thread_sys_t *sys = vout;
-ThreadFilterFlush(vout, true);
-ThreadDelAllFilterCallbacks(vout);
+FilterFlush(vout, true);
+DelAllFilterCallbacks(vout);
vlc_array_t array_static;
vlc_array_t array_interactive;
@@ -938,7 +938,7 @@ static void ThreadChangeFilters(vout_thread_sys_t *vout)
if (filter_chain_AppendConverter(sys->filter.chain_interactive,
_target) != 0) {
msg_Err(>obj, "Failed to compensate for the format changes,
removing all filters");
-ThreadDelAllFilterCallbacks(vout);
+DelAllFilterCallbacks(vout);
filter_chain_Reset(sys->filter.chain_static, _target,
vctx_target, _target);
filter_chain_Reset(sys->filter.chain_interactive, _target,
vctx_target, _target);
}
@@ -949,8 +949,8 @@ static void ThreadChangeFilters(vout_thread_sys_t *vout)
sys->filter.changed = false;
}
-static bool ThreadDisplayIsPictureLate(vout_thread_sys_t *vout, picture_t
*decoded,
- vlc_tick_t system_now, vlc_tick_t
system_pts)
+static bool IsPictureLate(vout_thread_sys_t *vout, picture_t *decoded,
+ vlc_tick_t system_now, vlc_tick_t system_pts)
{
vout_thread_sys_t *sys = vout;
@@ -974,8 +974,8 @@ static bool ThreadDisplayIsPictureLate(vout_thread_sys_t
*vout, picture_t *decod
/* */
VLC_USED
-static picture_t *ThreadDisplayPreparePicture(vout_thread_sys_t *vout, bool
reuse_decoded,
- bool frame_by_frame, bool *paused)
+static picture_t *PreparePicture(vout_thread_sys_t *vout, bool reuse_decoded,
+ bool frame_by_frame, bool *paused)
{
vout_thread_sys_t *sys = vout;
bool is_late_dropped = sys->is_late_dropped && !frame_by_frame;
@@ -1009,7 +1009,7 @@ static picture_t
*ThreadDisplayPreparePicture(vout_thread_sys_t *vout, bool reus
}
else
{
-if (ThreadDisplayIsPictureLate(vout, decoded,
system_now,
+if (IsPictureLate(vout, decoded, system_now,
system_pts))
{
picture_Release(decoded);
@@ -1029,7 +1029,7 @@ static picture_t
*ThreadDisplayPreparePicture(vout_thread_sys_t *vout, bool reus
vlc_video_context_Release(sys->filter.src_vctx);
sys->filter.src_vctx = pic_vctx ?
vlc_video_context_Hold(pic_vctx) : NULL;
-ThreadChangeFilters(vout);
+ChangeFilters(vout);
}
}
}
@@ -1119,7
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: Update NEWS
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC Commits: 8f4f4b19 by Hugo Beauzée-Luyssen at 2021-06-16T10:24:18+02:00 Update NEWS - - - - - e43321ef by Hugo Beauzée-Luyssen at 2021-06-16T10:24:18+02:00 On the road to 3.0.16 - - - - - 2 changed files: - NEWS - configure.ac Changes: = NEWS = @@ -1,3 +1,15 @@ +Changes between 3.0.15 and 3.0.16: +-- + +Video Output: + * Fix a D3D11 crash on Windows 8/8.1 + +Interfaces: + * macOS: Add touchbar support + +Misc + * Multiple settings improvements + Changes between 3.0.14 and 3.0.15: -- = configure.ac = @@ -2,10 +2,10 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2021 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.15) +AC_INIT(vlc, 3.0.16) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=15 +VERSION_REVISION=16 VERSION_EXTRA=0 VERSION_DEV= View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2d5997118d7f0078827682c3dca155235ecf1454...e43321ef93adc41a67632c86182c086281ab4848 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2d5997118d7f0078827682c3dca155235ecf1454...e43321ef93adc41a67632c86182c086281ab4848 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] afile: check equality, not starts with
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
2d599711 by Lyndon Brown at 2021-06-16T05:37:02+00:00
afile: check equality, not starts with
(cherry picked from commit ae6af4007e7b957052ad88dee3af8958e31ca7f0)
- - - - -
1 changed file:
- modules/audio_output/file.c
Changes:
=
modules/audio_output/file.c
=
@@ -181,7 +181,7 @@ static int Start( audio_output_t *p_aout,
audio_sample_format_t *restrict fmt )
i_format_list_size = (int)ARRAY_SIZE(format_list);
for (i = 0; i < i_format_list_size; i++)
{
-if ( !strncmp( format_list[i], psz_format, strlen(format_list[i]) ) )
+if ( !strcmp( format_list[i], psz_format ) )
{
break;
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/2d5997118d7f0078827682c3dca155235ecf1454
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/2d5997118d7f0078827682c3dca155235ecf1454
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] macosx: expose live status and artwork to the OS
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
9b77a171 by Felix Paul Kühne at 2021-06-16T05:40:08+00:00
macosx: expose live status and artwork to the OS
- - - - -
1 changed file:
- modules/gui/macosx/os-integration/VLCRemoteControlService.m
Changes:
=
modules/gui/macosx/os-integration/VLCRemoteControlService.m
=
@@ -1,7 +1,7 @@
/*
* VLCRemoteControlService.m: MacOS X interface module
*
- * Copyright (C) 2017-2019 VLC authors and VideoLAN
+ * Copyright (C) 2017-2021 VLC authors and VideoLAN
*
* Authors: Carola Nitz
* Felix Paul Kühne
@@ -157,7 +157,22 @@ static inline NSArray *
RemoteCommandCenterCommandsToHandle()
currentlyPlayingTrackInfo[MPMediaItemPropertyArtist] = inputItem.artist;
currentlyPlayingTrackInfo[MPMediaItemPropertyAlbumTitle] =
inputItem.albumName;
currentlyPlayingTrackInfo[MPMediaItemPropertyAlbumTrackNumber] =
@([inputItem.trackNumber intValue]);
-currentlyPlayingTrackInfo[MPMediaItemPropertyPlaybackDuration] =
@(SEC_FROM_VLC_TICK(inputItem.duration));
+
+vlc_tick_t duration = inputItem.duration;
+currentlyPlayingTrackInfo[MPMediaItemPropertyPlaybackDuration] =
@(SEC_FROM_VLC_TICK(duration));
+currentlyPlayingTrackInfo[MPNowPlayingInfoPropertyIsLiveStream] =
@(duration <= 0);
+
+NSURL *artworkURL = inputItem.artworkURL;
+if (artworkURL) {
+NSImage *coverArtImage = [[NSImage alloc]
initWithContentsOfURL:artworkURL];
+if (coverArtImage) {
+MPMediaItemArtwork *mpartwork = [[MPMediaItemArtwork alloc]
initWithBoundsSize:coverArtImage.size
+
requestHandler:^NSImage* _Nonnull(CGSize size) {
+return coverArtImage;
+}];
+currentlyPlayingTrackInfo[MPMediaItemPropertyArtwork] = mpartwork;
+}
+}
[MPNowPlayingInfoCenter defaultCenter].nowPlayingInfo =
currentlyPlayingTrackInfo;
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9b77a1719856c9da8c8c2db3b347e1026f957362
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9b77a1719856c9da8c8c2db3b347e1026f957362
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
