Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (8)
......@@ -337,10 +337,14 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
- (void)shuffleStateUpdated:(NSNotification *)aNotification
{
if (_playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL) {
self.shufflePlaylistButton.image = [NSImage imageNamed:@"shuffleOff"];
if (@available(macOS 11.0, *)) {
self.shufflePlaylistButton.image = [NSImage imageWithSystemSymbolName:@"shuffle"
accessibilityDescription:@"Shuffle"];
self.shufflePlaylistButton.contentTintColor = _playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ?
nil : [NSColor VLCAccentColor];
} else {
self.shufflePlaylistButton.image = [[NSImage imageNamed:@"shuffleOn"] imageTintedWithColor:NSColor.VLCAccentColor];
self.shufflePlaylistButton.image = _playlistController.playbackOrder == VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL ?
[NSImage imageNamed:@"shuffleOff"] : [[NSImage imageNamed:@"shuffleOn"] imageTintedWithColor:NSColor.VLCAccentColor];
}
}
......@@ -364,17 +368,37 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
- (void)repeatStateUpdated:(NSNotification *)aNotification
{
enum vlc_playlist_playback_repeat currentRepeatState = _playlistController.playbackRepeat;
switch (currentRepeatState) {
case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
self.repeatPlaylistButton.image = [[NSImage imageNamed:@"repeatAll"] imageTintedWithColor:NSColor.VLCAccentColor];
break;
case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
self.repeatPlaylistButton.image = [[NSImage imageNamed:@"repeatOne"] imageTintedWithColor:NSColor.VLCAccentColor];
break;
default:
self.repeatPlaylistButton.image = [NSImage imageNamed:@"repeatOff"];
break;
if (@available(macOS 11.0, *)) {
switch (currentRepeatState) {
case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
self.repeatPlaylistButton.image = [NSImage imageWithSystemSymbolName:@"repeat.1"
accessibilityDescription:@"Repeat current"];
self.repeatPlaylistButton.contentTintColor = [NSColor VLCAccentColor];
break;
case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
self.repeatPlaylistButton.image = [NSImage imageWithSystemSymbolName:@"repeat"
accessibilityDescription:@"Repeat"];
self.repeatPlaylistButton.contentTintColor = [NSColor VLCAccentColor];
break;
default:
self.repeatPlaylistButton.image = [NSImage imageWithSystemSymbolName:@"repeat"
accessibilityDescription:@"Repeat"];
self.repeatPlaylistButton.contentTintColor = nil;
break;
}
} else {
switch (currentRepeatState) {
case VLC_PLAYLIST_PLAYBACK_REPEAT_ALL:
self.repeatPlaylistButton.image = [[NSImage imageNamed:@"repeatAll"] imageTintedWithColor:NSColor.VLCAccentColor];
break;
case VLC_PLAYLIST_PLAYBACK_REPEAT_CURRENT:
self.repeatPlaylistButton.image = [[NSImage imageNamed:@"repeatOne"] imageTintedWithColor:NSColor.VLCAccentColor];
break;
default:
self.repeatPlaylistButton.image = [NSImage imageNamed:@"repeatOff"];
break;
}
}
}
......
......@@ -52,6 +52,11 @@
NSImage *_pressedPauseImage;
NSImage *_playImage;
NSImage *_pressedPlayImage;
NSImage *_backwardImage;
NSImage *_forwardImage;
NSImage *_fullscreenImage;
NSImage *_mutedVolumeImage;
NSImage *_unmutedVolumeImage;
NSTimeInterval last_fwd_event;
NSTimeInterval last_bwd_event;
......@@ -94,7 +99,7 @@
name:VLCPlayerStateChanged
object:nil];
[notificationCenter addObserver:self
selector:@selector(updateCurrentItemDisplayControls:)
selector:@selector(updatePlaybackControls:)
name:VLCPlayerCurrentMediaItemChanged
object:nil];
[notificationCenter addObserver:self
......@@ -124,17 +129,44 @@
[self.fullscreenButton setToolTip: _NS("Enter fullscreen")];
self.fullscreenButton.accessibilityLabel = self.fullscreenButton.toolTip;
[self.backwardButton setImage: imageFromRes(@"VLCBackwardTemplate")];
[self.backwardButton setAlternateImage: imageFromRes(@"VLCBackwardTemplate")];
_playImage = imageFromRes(@"VLCPlayTemplate");
_pressedPlayImage = imageFromRes(@"VLCPlayTemplate");
_pauseImage = imageFromRes(@"VLCPauseTemplate");
_pressedPauseImage = imageFromRes(@"VLCPauseTemplate");
[self.forwardButton setImage: imageFromRes(@"VLCForwardTemplate")];
[self.forwardButton setAlternateImage: imageFromRes(@"VLCForwardTemplate")];
[self.fullscreenButton setImage: imageFromRes(@"VLCFullscreenOffTemplate")];
[self.fullscreenButton setAlternateImage: imageFromRes(@"VLCFullscreenOffTemplate")];
if (@available(macOS 11.0, *)) {
_playImage = [NSImage imageWithSystemSymbolName:@"play.circle.fill"
accessibilityDescription:_NS("Play")];
_pressedPlayImage = [NSImage imageWithSystemSymbolName:@"play.circle.fill"
accessibilityDescription:_NS("Play")];
_pauseImage = [NSImage imageWithSystemSymbolName:@"pause.circle.fill"
accessibilityDescription:_NS("Pause")];
_pressedPauseImage = [NSImage imageWithSystemSymbolName:@"pause.circle.fill"
accessibilityDescription:_NS("Pause")];
_backwardImage = [NSImage imageWithSystemSymbolName:@"backward.fill"
accessibilityDescription:_NS("Previous")];
_forwardImage = [NSImage imageWithSystemSymbolName:@"forward.fill"
accessibilityDescription:_NS("Next")];
_fullscreenImage = [NSImage imageWithSystemSymbolName:@"arrow.up.backward.and.arrow.down.forward"
accessibilityDescription:_NS("Fullscreen")];
_mutedVolumeImage = [NSImage imageWithSystemSymbolName:@"speaker.slash.fill"
accessibilityDescription:_NS("Muted")];
_unmutedVolumeImage = [NSImage imageWithSystemSymbolName:@"speaker.wave.3.fill"
accessibilityDescription:_NS("Unmuted")];
} else {
_playImage = imageFromRes(@"VLCPlayTemplate");
_pressedPlayImage = imageFromRes(@"VLCPlayTemplate");
_pauseImage = imageFromRes(@"VLCPauseTemplate");
_pressedPauseImage = imageFromRes(@"VLCPauseTemplate");
_backwardImage = imageFromRes(@"VLCBackwardTemplate");
_forwardImage = imageFromRes(@"VLCForwardTemplate");
_fullscreenImage = imageFromRes(@"VLCFullscreenOffTemplate");
_mutedVolumeImage = imageFromRes(@"VLCVolumeOffTemplate");
_unmutedVolumeImage = imageFromRes(@"VLCVolumeOnTemplate");
}
[self.backwardButton setImage: _backwardImage];
[self.backwardButton setAlternateImage: _backwardImage];
[self.forwardButton setImage: _forwardImage];
[self.forwardButton setAlternateImage: _forwardImage];
[self.fullscreenButton setImage: _fullscreenImage];
[self.fullscreenButton setAlternateImage: _fullscreenImage];
[self.playButton setImage: _playImage];
[self.playButton setAlternateImage: _pressedPlayImage];
......@@ -399,7 +431,7 @@
- (void)updateMuteVolumeButtonImage
{
_muteVolumeButton.image = _playerController.mute ?
imageFromRes(@"VLCVolumeOffTemplate") : imageFromRes(@"VLCVolumeOnTemplate");
_mutedVolumeImage : _unmutedVolumeImage;
}
- (void)playerStateUpdated:(NSNotification *)aNotification
......@@ -420,6 +452,7 @@
[self.forwardButton setEnabled: (b_seekable || _playlistController.hasNextPlaylistItem || b_chapters)];
[self.backwardButton setEnabled: (b_seekable || _playlistController.hasPreviousPlaylistItem || b_chapters)];
[self updateCurrentItemDisplayControls:aNotification];
}
- (void)updateCurrentItemDisplayControls:(NSNotification *)aNotification
......
......@@ -51,6 +51,8 @@
@interface VLCMainWindowControlsBar()
{
NSImage *_alwaysMuteImage;
VLCPlaylistController *_playlistController;
VLCPlayerController *_playerController;
}
......@@ -80,18 +82,23 @@
[self.volumeUpButton setToolTip: _NS("Full Volume")];
self.volumeUpButton.accessibilityLabel = self.volumeUpButton.toolTip;
[self.stopButton setImage: imageFromRes(@"stop")];
[self.stopButton setAlternateImage: imageFromRes(@"stop-pressed")];
if (@available(macOS 11.0, *)) {
_alwaysMuteImage = [NSImage imageWithSystemSymbolName:@"speaker.minus.fill"
accessibilityDescription:_NS("Mute")];
[self.volumeUpButton setImage: imageFromRes(@"VLCVolumeOnTemplate")];
[self.stopButton setImage: [NSImage imageWithSystemSymbolName:@"stop.fill"
accessibilityDescription:_NS("Stop")]];
[self.volumeUpButton setImage: [NSImage imageWithSystemSymbolName:@"speaker.plus.fill"
accessibilityDescription:_NS("Volume up")]];
} else {
_alwaysMuteImage = [NSImage imageNamed:@"VLCVolumeOffTemplate"];
[self.fullscreenButton setImage: imageFromRes(@"VLCFullscreenOffTemplate")];
[self.fullscreenButton setAlternateImage: imageFromRes(@"VLCFullscreenOffTemplate")];
[self.stopButton setImage: imageFromRes(@"stop")];
[self.stopButton setAlternateImage: imageFromRes(@"stop-pressed")];
[self.volumeUpButton setImage: imageFromRes(@"VLCVolumeOnTemplate")];
}
[self.prevButton setImage: imageFromRes(@"previous-6btns")];
[self.prevButton setAlternateImage: imageFromRes(@"previous-6btns-pressed")];
[self.nextButton setImage: imageFromRes(@"next-6btns")];
[self.nextButton setAlternateImage: imageFromRes(@"next-6btns-pressed")];
[self updateMuteVolumeButtonImage];
[self playbackStateChanged:nil];
[self.stopButton setHidden:YES];
......@@ -172,7 +179,7 @@
- (void)updateMuteVolumeButtonImage
{
self.muteVolumeButton.image = imageFromRes(@"VLCVolumeOffTemplate");
self.muteVolumeButton.image = _alwaysMuteImage;
}
- (void)playbackStateChanged:(NSNotification *)aNotification
......@@ -197,6 +204,7 @@
[self.prevButton setEnabled: (b_seekable || _playlistController.hasPreviousPlaylistItem || b_chapters)];
[self.nextButton setEnabled: (b_seekable || _playlistController.hasNextPlaylistItem || b_chapters)];
[self updateCurrentItemDisplayControls:aNotification];
}
@end