From c17f8a5b4aa795d848edac4e6c1f8c45c4d6ad5c Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 22 Feb 2023 13:13:26 +0100 Subject: [PATCH] macosx: Remove no longer needed VLCDetachedVideoWindow Signed-off-by: Claudio Cambra --- .../macosx/VLC.xcodeproj/project.pbxproj | 10 - modules/gui/macosx/Makefile.am | 3 - modules/gui/macosx/UI/DetachedVideoWindow.xib | 193 ------------------ .../windows/video/VLCDetachedVideoWindow.h | 28 --- .../windows/video/VLCDetachedVideoWindow.m | 39 ---- .../windows/video/VLCVideoOutputProvider.m | 1 - po/POTFILES.in | 2 - 7 files changed, 276 deletions(-) delete mode 100644 modules/gui/macosx/UI/DetachedVideoWindow.xib delete mode 100644 modules/gui/macosx/windows/video/VLCDetachedVideoWindow.h delete mode 100644 modules/gui/macosx/windows/video/VLCDetachedVideoWindow.m diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj index ade4482129..342273912c 100644 --- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj +++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj @@ -61,7 +61,6 @@ 1CCC88F62078A3D500E5626F /* VLCInformationWindow.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B82240B1E4D2A9000833BE1 /* VLCInformationWindow.xib */; }; 1CCC88F72078A3D500E5626F /* ConvertAndSave.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */; }; 1CCC88F82078A3D500E5626F /* CoreDialogs.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */; }; - 1CCC88F92078A3D500E5626F /* DetachedVideoWindow.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */; }; 1CCC88FA2078A3D500E5626F /* ErrorPanel.xib in Sources */ = {isa = PBXBuildFile; fileRef = 1CFE8D561EA0D3D300E94451 /* ErrorPanel.xib */; }; 1CCC88FB2078A3D500E5626F /* Help.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224071E4D2A9000833BE1 /* Help.xib */; }; 1CCC88FC2078A3D500E5626F /* LogMessageWindow.xib in Sources */ = {isa = PBXBuildFile; fileRef = 6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */; }; @@ -153,7 +152,6 @@ 7D61DCE4236C1937008133CF /* VLCCustomWindowButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D61DCE3236C1937008133CF /* VLCCustomWindowButton.m */; }; 7D66D4362200BC340040D04A /* VLCClickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D66D4352200BC340040D04A /* VLCClickerManager.m */; }; 7D66D4392200C5B80040D04A /* VLCVideoFilterHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D66D4382200C5B80040D04A /* VLCVideoFilterHelper.m */; }; - 7D66D43C2200D6090040D04A /* VLCDetachedVideoWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D66D43B2200D6090040D04A /* VLCDetachedVideoWindow.m */; }; 7D67318622C8F4060000AD40 /* VLCMediaSourceCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D67318422C8F4050000AD40 /* VLCMediaSourceCollectionViewItem.m */; }; 7D713D322201AE350042BEB7 /* VLCLibraryWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D713D312201AE350042BEB7 /* VLCLibraryWindow.m */; }; 7D713D362201DC640042BEB7 /* VLCLibraryWindow.xib in Sources */ = {isa = PBXBuildFile; fileRef = 7D713D332201BB130042BEB7 /* VLCLibraryWindow.xib */; }; @@ -351,7 +349,6 @@ 6B8224011E4D2A9000833BE1 /* Bookmarks.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Bookmarks.xib; sourceTree = ""; }; 6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConvertAndSave.xib; sourceTree = ""; }; 6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CoreDialogs.xib; sourceTree = ""; }; - 6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetachedVideoWindow.xib; sourceTree = ""; }; 6B8224071E4D2A9000833BE1 /* Help.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Help.xib; sourceTree = ""; }; 6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LogMessageWindow.xib; sourceTree = ""; }; 6B8224091E4D2A9000833BE1 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; @@ -609,8 +606,6 @@ 7D66D4352200BC340040D04A /* VLCClickerManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCClickerManager.m; sourceTree = ""; }; 7D66D4372200C5B80040D04A /* VLCVideoFilterHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCVideoFilterHelper.h; sourceTree = ""; }; 7D66D4382200C5B80040D04A /* VLCVideoFilterHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCVideoFilterHelper.m; sourceTree = ""; }; - 7D66D43A2200D6090040D04A /* VLCDetachedVideoWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCDetachedVideoWindow.h; sourceTree = ""; }; - 7D66D43B2200D6090040D04A /* VLCDetachedVideoWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCDetachedVideoWindow.m; sourceTree = ""; }; 7D67318322C8F3F60000AD40 /* VLCMediaSourceCollectionViewItem.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VLCMediaSourceCollectionViewItem.xib; sourceTree = ""; }; 7D67318422C8F4050000AD40 /* VLCMediaSourceCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCMediaSourceCollectionViewItem.m; sourceTree = ""; }; 7D67318522C8F4050000AD40 /* VLCMediaSourceCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCMediaSourceCollectionViewItem.h; sourceTree = ""; }; @@ -913,8 +908,6 @@ 1C1ED5052204AA5800811EC0 /* video */ = { isa = PBXGroup; children = ( - 7D66D43A2200D6090040D04A /* VLCDetachedVideoWindow.h */, - 7D66D43B2200D6090040D04A /* VLCDetachedVideoWindow.m */, 534E8E3829A06325009503F8 /* VLCMainVideoViewController.h */, 534E8E3929A06325009503F8 /* VLCMainVideoViewController.m */, 1CAC3EE720CD1B3B00613DB2 /* VLCVideoOutputProvider.h */, @@ -1728,7 +1721,6 @@ 6B8224011E4D2A9000833BE1 /* Bookmarks.xib */, 6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */, 6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */, - 6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */, 1CFE8D561EA0D3D300E94451 /* ErrorPanel.xib */, 6B8224071E4D2A9000833BE1 /* Help.xib */, 6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */, @@ -1868,7 +1860,6 @@ 6BAF886024DB1CEA001044C8 /* VLCSystemVolume.m in Sources */, 1CCC88F72078A3D500E5626F /* ConvertAndSave.xib in Sources */, 1CCC88F82078A3D500E5626F /* CoreDialogs.xib in Sources */, - 1CCC88F92078A3D500E5626F /* DetachedVideoWindow.xib in Sources */, 1CCC88FA2078A3D500E5626F /* ErrorPanel.xib in Sources */, 1CCC88FB2078A3D500E5626F /* Help.xib in Sources */, 1CCC88FC2078A3D500E5626F /* LogMessageWindow.xib in Sources */, @@ -1912,7 +1903,6 @@ 1C3113F31E508C7600D4DD76 /* VLCRendererMenuController.m in Sources */, 6B4D50931E7979CB004479B5 /* VLCSimplePrefsWindow.m in Sources */, 6B397C4F216C8EB200403ED0 /* NSString+Helpers.m in Sources */, - 7D66D43C2200D6090040D04A /* VLCDetachedVideoWindow.m in Sources */, 1C31138E1E508C6900D4DD76 /* VLCAboutWindowController.m in Sources */, 1C3113901E508C6900D4DD76 /* VLCHelpWindowController.m in Sources */, 7D1BF28D22A192000027C50F /* VLCPlaylistSortingMenuController.m in Sources */, diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 6a57e81fea..09787a6d7b 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -339,8 +339,6 @@ libmacosx_plugin_la_SOURCES = \ gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m \ gui/macosx/windows/video/VLCAspectRatioRetainingVideoWindow.h \ gui/macosx/windows/video/VLCAspectRatioRetainingVideoWindow.m \ - gui/macosx/windows/video/VLCDetachedVideoWindow.h \ - gui/macosx/windows/video/VLCDetachedVideoWindow.m \ gui/macosx/windows/video/VLCMainVideoViewController.h \ gui/macosx/windows/video/VLCMainVideoViewController.m \ gui/macosx/windows/video/VLCVideoOutputProvider.h \ @@ -362,7 +360,6 @@ libmacosx_plugin_la_XIB_SOURCES = \ gui/macosx/UI/Bookmarks.xib \ gui/macosx/UI/ConvertAndSave.xib \ gui/macosx/UI/CoreDialogs.xib \ - gui/macosx/UI/DetachedVideoWindow.xib \ gui/macosx/UI/ErrorPanel.xib \ gui/macosx/UI/Help.xib \ gui/macosx/UI/LogMessageWindow.xib \ diff --git a/modules/gui/macosx/UI/DetachedVideoWindow.xib b/modules/gui/macosx/UI/DetachedVideoWindow.xib deleted file mode 100644 index d5cde479c5..0000000000 --- a/modules/gui/macosx/UI/DetachedVideoWindow.xib +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/gui/macosx/windows/video/VLCDetachedVideoWindow.h b/modules/gui/macosx/windows/video/VLCDetachedVideoWindow.h deleted file mode 100644 index 2e1ad8b486..0000000000 --- a/modules/gui/macosx/windows/video/VLCDetachedVideoWindow.h +++ /dev/null @@ -1,28 +0,0 @@ -/***************************************************************************** - * VLCDetachedVideoWindow.m: MacOS X interface module - ***************************************************************************** - * Copyright (C) 2002-2019 VLC authors and VideoLAN - * - * Authors: Felix Paul Kühne - * David Fuhrmann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -#import "VLCAspectRatioRetainingVideoWindow.h" - -@interface VLCDetachedVideoWindow : VLCAspectRatioRetainingVideoWindow - -@end diff --git a/modules/gui/macosx/windows/video/VLCDetachedVideoWindow.m b/modules/gui/macosx/windows/video/VLCDetachedVideoWindow.m deleted file mode 100644 index 87bbbbe18b..0000000000 --- a/modules/gui/macosx/windows/video/VLCDetachedVideoWindow.m +++ /dev/null @@ -1,39 +0,0 @@ -/***************************************************************************** - * VLCDetachedVideoWindow.m: MacOS X interface module - ***************************************************************************** - * Copyright (C) 2002-2019 VLC authors and VideoLAN - * - * Authors: Felix Paul Kühne - * David Fuhrmann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -#import "VLCDetachedVideoWindow.h" - -#import "windows/mainwindow/VLCControlsBarCommon.h" - -@implementation VLCDetachedVideoWindow - -- (void)awakeFromNib -{ - // sets lion fullscreen behaviour - [super awakeFromNib]; - [self setAcceptsMouseMovedEvents: YES]; - - [self setContentMinSize: NSMakeSize(363., VLCVideoWindowCommonMinimalHeight + [[self controlsBar] height])]; -} - -@end diff --git a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m index 11c2e2ddd3..ceb44bb482 100644 --- a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m +++ b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m @@ -41,7 +41,6 @@ #import "playlist/VLCPlayerController.h" #import "windows/video/VLCAspectRatioRetainingVideoWindow.h" -#import "windows/video/VLCDetachedVideoWindow.h" #import "windows/video/VLCMainVideoViewController.h" #import "windows/video/VLCVoutView.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index 53521026a6..3908b572eb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -655,8 +655,6 @@ modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.h modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.m modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.h modules/gui/macosx/windows/mainwindow/VLCMainWindowControlsBar.m -modules/gui/macosx/windows/video/VLCDetachedVideoWindow.h -modules/gui/macosx/windows/video/VLCDetachedVideoWindow.m modules/gui/macosx/windows/video/VLCVideoOutputProvider.h modules/gui/macosx/windows/video/VLCVideoOutputProvider.m modules/gui/macosx/windows/video/VLCVideoWindowCommon.h