[vlc-commits] macOS: Remove BGHUDAppKit in build scripts
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Mon Jan 30
12:15:23 2017 +0100| [70f9a30c3315bfdcb82c92fad087b1949b218634] | committer:
Jean-Baptiste Kempf
macOS: Remove BGHUDAppKit in build scripts
This removes BGHUDAppKit from the Xcode project, package and codesign script.
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70f9a30c3315bfdcb82c92fad087b1949b218634
---
extras/package/macosx/codesign.sh | 3 ---
extras/package/macosx/package.mak | 2 --
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 6 --
3 files changed, 11 deletions(-)
diff --git a/extras/package/macosx/codesign.sh
b/extras/package/macosx/codesign.sh
index 8131d2c..a45c513 100755
--- a/extras/package/macosx/codesign.sh
+++ b/extras/package/macosx/codesign.sh
@@ -92,8 +92,6 @@ else
find VLC.app/Contents/Frameworks -type f -name "*.txt" -exec rm '{}' \;
info "Signing frameworks"
-IDENTIFIER="com.binarymethod.BGHUDAppKit"
-codesign --force --verbose -s "$IDENTITY"
--preserve-metadata=identifier,entitlements --requirements
"$FIRSTPARTOF_REQUIREMENT$IDENTIFIER$SECONDPARTOF_REQUIREMENT" --timestamp=none
VLC.app/Contents/Frameworks/BGHUDAppKit.framework/Versions/A
IDENTIFIER="com.growl.growlframework"
codesign --force --verbose -s "$IDENTITY"
--preserve-metadata=identifier,entitlements --requirements
"$FIRSTPARTOF_REQUIREMENT$IDENTIFIER$SECONDPARTOF_REQUIREMENT" --timestamp=none
VLC.app/Contents/Frameworks/Growl.framework/Versions/A
IDENTIFIER="org.sparkle-project.Sparkle.Autoupdate"
@@ -184,7 +182,6 @@ fi
info "all items signed, validating..."
info "Validating frameworks"
-codesign --verify -vv VLC.app/Contents/Frameworks/BGHUDAppKit.framework
codesign --verify -vv VLC.app/Contents/Frameworks/Growl.framework
codesign --verify -vv VLC.app/Contents/Frameworks/Sparkle.framework
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 0206af0..29fbd9a 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -18,8 +18,6 @@ VLC-dev.app: VLC-tmp
VLC.app: VLC-tmp
rm -Rf $@
cp -R VLC-tmp $@
- rm -Rf
$@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/BGHUDAppKitPlugin.ibplugin
- rm -Rf
$@/Contents/Frameworks/BGHUDAppKit.framework/Versions/A/Resources/README.textile
PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir)
build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/build-package.sh
bin/vlc-cache-gen $@/Contents/MacOS/plugins
find $@ -type d -exec chmod ugo+rx '{}' \;
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 6c3f61e..5241549 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -644,8 +644,6 @@
CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework
*/; };
CC4EFC2D13E96BD00091D19A /* dropzone.png in Resources */ = {isa
= PBXBuildFile; fileRef = CC4EFC2C13E96BD00091D19A /* dropzone.png */; };
CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */ = {isa
= PBXBuildFile; fileRef = CC8062631021F8790021EB9A /* dsa_pub.pem */; };
- CC84FB2D130083BB00816D38 /* BGHUDAppKit.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /*
BGHUDAppKit.framework */; };
- CC84FB481300843200816D38 /* BGHUDAppKit.framework in Copy
Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /*
BGHUDAppKit.framework */; };
CC91906E159B4BB800E634A7 /* volume-high_d...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = CC91903C159B4BB800E634A7 /*
volume-high_d...@2x.png */; };
CC91906F159B4BB800E634A7 /* volume-low_d...@2x.png in Resources
*/ = {isa = PBXBuildFile; fileRef = CC91903D159B4BB800E634A7 /*
volume-low_d...@2x.png */; };
CC919070159B4BB800E634A7 /* volume-slider-knob_d...@2x.png in
Resources */ = {isa = PBXBuildFile; fileRef = CC91903E159B4BB800E634A7 /*
volume-slider-knob_d...@2x.png */; };
@@ -796,7 +794,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
- CC84FB481300843200816D38 /*
BGHUDAppKit.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -1446,7 +1443,6 @@
CC707EC4137464CD0003010A /*
VLCTrackSynchr
[vlc-commits] macOS: Update HUD panel tab views
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Mon Jan 30 12:15:25 2017 +0100| [8e31c65a4c2aaa832b11a70745d52e698dedad04] | committer: Jean-Baptiste Kempf macOS: Update HUD panel tab views Sets the tab view to tabless and adds a segmented control on top of the panel with a line below. Using the tabs of the tab view will look broken on macOS 10.10 and higher due to some quirks with the translucent dark style. Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e31c65a4c2aaa832b11a70745d52e698dedad04 --- .../Resources/English.lproj/AudioEffects.xib | 145 +++ .../macosx/Resources/English.lproj/MediaInfo.xib | 114 +-- .../Resources/English.lproj/VideoEffects.xib | 156 - 3 files changed, 247 insertions(+), 168 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=8e31c65a4c2aaa832b11a70745d52e698dedad04 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS: Remove all BGHUD classes from XIBs
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Mon Jan 30 12:15:21 2017 +0100| [9b96ebf12a3bb17556704d6775061ad1596968a7] | committer: Jean-Baptiste Kempf macOS: Remove all BGHUD classes from XIBs This is done in preparation for more minimal replacement classes that do custom drawing for OS X < 10.10 and on 10.10+ we will use the native translucent dark UI provided by the system. Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b96ebf12a3bb17556704d6775061ad1596968a7 --- configure.ac | 5 - .../Resources/English.lproj/AudioEffects.xib | 32 +- .../macosx/Resources/English.lproj/Bookmarks.xib | 91 +-- .../macosx/Resources/English.lproj/MainWindow.xib | 4 +- .../macosx/Resources/English.lproj/MediaInfo.xib | 286 +++-- .../macosx/Resources/English.lproj/SyncTracks.xib | 82 +-- .../Resources/English.lproj/VideoEffects.xib | 671 + modules/gui/macosx/Makefile.am | 2 +- 8 files changed, 290 insertions(+), 883 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=9b96ebf12a3bb17556704d6775061ad1596968a7 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: macOS: Remove BGHUDAppKit
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Mon Jan 30
12:15:24 2017 +0100| [c26f342b6be3bdadce9111480f0247d467ca7e9a] | committer:
Jean-Baptiste Kempf
contrib: macOS: Remove BGHUDAppKit
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c26f342b6be3bdadce9111480f0247d467ca7e9a
---
contrib/src/bghudappkit/bghudappkit-no-pch.patch | 30 -
contrib/src/bghudappkit/bghudappkit-xcode5.patch | 144 ---
contrib/src/bghudappkit/rules.mak| 28 -
3 files changed, 202 deletions(-)
diff --git a/contrib/src/bghudappkit/bghudappkit-no-pch.patch
b/contrib/src/bghudappkit/bghudappkit-no-pch.patch
deleted file mode 100644
index 0c95ab2..000
--- a/contrib/src/bghudappkit/bghudappkit-no-pch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru bghudappkit/BGHUDAppKit.xcodeproj/project.pbxproj
bghudappkit/BGHUDAppKit.xcodeproj/project.pbxproj
bghudappkit/BGHUDAppKit.xcodeproj/project.pbxproj 2016-07-14
14:29:53.0 +0200
-+++ bghudappkit/BGHUDAppKit.xcodeproj/project.pbxproj 2016-07-14
14:28:54.0 +0200
-@@ -1076,8 +1076,6 @@
- FRAMEWORK_VERSION = A;
- GCC_ENABLE_OBJC_GC = disabled;
- GCC_MODEL_TUNING = G5;
-- GCC_PRECOMPILE_PREFIX_HEADER = YES;
-- GCC_PREFIX_HEADER =
"$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- INFOPLIST_FILE =
"BGHUDAppKitFramework-Info.plist";
- INSTALL_PATH = "@executable_path/../Frameworks";
- LD_DYLIB_INSTALL_NAME =
"$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
-@@ -1105,8 +1103,6 @@
- GCC_ENABLE_OBJC_GC = disabled;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
-- GCC_PRECOMPILE_PREFIX_HEADER = YES;
-- GCC_PREFIX_HEADER =
"$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
- GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS
= NO;
- GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-@@ -1149,8 +1145,6 @@
- FRAMEWORK_VERSION = A;
- GCC_ENABLE_OBJC_GC = disabled;
- GCC_MODEL_TUNING = G5;
-- GCC_PRECOMPILE_PREFIX_HEADER = YES;
-- GCC_PREFIX_HEADER =
"$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- INFOPLIST_FILE =
"BGHUDAppKitFramework-Info.plist";
- INSTALL_PATH = "@executable_path/../Frameworks";
- LD_DYLIB_INSTALL_NAME =
"$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
diff --git a/contrib/src/bghudappkit/bghudappkit-xcode5.patch
b/contrib/src/bghudappkit/bghudappkit-xcode5.patch
deleted file mode 100644
index f746caf..000
--- a/contrib/src/bghudappkit/bghudappkit-xcode5.patch
+++ /dev/null
@@ -1,144 +0,0 @@
a/BGHUDAppKit.xcodeproj/project.pbxproj2014-06-25 19:36:42.0
-0400
-+++ b/BGHUDAppKit.xcodeproj/project.pbxproj2014-06-25 19:31:38.0
-0400
-@@ -823,6 +823,9 @@
- /* Begin PBXProject section */
- 0259C573FE90428111CA0C5A /* Project object */ = {
- isa = PBXProject;
-+ attributes = {
-+ LastUpgradeCheck = 0510;
-+ };
- buildConfigurationList = C056398B08A954F8003078D8 /*
Build configuration list for PBXProject "BGHUDAppKit" */;
- compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
-@@ -1009,7 +1012,7 @@
- 3D9BABBF1166D18F008CEA8B /* Release_10.6_10.5_32_64_GC_embed */
= {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-+ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
- GCC_ENABLE_OBJC_GC = supported;
- GCC_MODEL_TUNING = "";
- GCC_VERSION =
com.apple.compilers.llvm.clang.1_0;
-@@ -1018,7 +1021,7 @@
- LLVM_LTO = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- PREBINDING = NO;
--
[vlc-commits] macosx: Fix more weak NSWindow references
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Fri Sep 9 15:58:23 2016 +0200| [869167dd83c2ff505773e8aece54ee0d1cab18b4] | committer: Jean-Baptiste Kempf macosx: Fix more weak NSWindow references Weak NSWindow references are not allowed on 10.7, and will lead to runtime crashes. Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=869167dd83c2ff505773e8aece54ee0d1cab18b4 --- modules/gui/macosx/VLCConvertAndSaveWindowController.h | 4 ++-- modules/gui/macosx/VLCOpenWindowController.h | 2 +- modules/gui/macosx/simple_prefs.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.h b/modules/gui/macosx/VLCConvertAndSaveWindowController.h index 1d24728..d3dbc6f 100644 --- a/modules/gui/macosx/VLCConvertAndSaveWindowController.h +++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.h @@ -62,7 +62,7 @@ @property (weak) IBOutlet NSButton *streamDestinationButton; // customize panel -@property (weak) IBOutlet NSWindow *customizePanel; +@property () IBOutlet NSWindow *customizePanel; @property (weak) IBOutlet NSButton *customizeNewProfileButton; @property (weak) IBOutlet NSButton *customizeCancelButton; @property (weak) IBOutlet NSButton *customizeOkButton; @@ -107,7 +107,7 @@ @property (weak) IBOutlet NSPopUpButton *customizeSubsPopup; // stream panel -@property (weak) IBOutlet NSWindow *streamPanel; +@property () IBOutlet NSWindow *streamPanel; @property (weak) IBOutlet NSTextField *streamDestinationLabel; @property (weak) IBOutlet NSTextField *streamTypeLabel; @property (weak) IBOutlet NSTextField *streamAddressLabel; diff --git a/modules/gui/macosx/VLCOpenWindowController.h b/modules/gui/macosx/VLCOpenWindowController.h index b42c3e9..918bfd4 100644 --- a/modules/gui/macosx/VLCOpenWindowController.h +++ b/modules/gui/macosx/VLCOpenWindowController.h @@ -116,7 +116,7 @@ @property (readwrite, weak) IBOutlet NSButton *netOpenUDPButton; @property (readwrite, weak) IBOutlet NSButton *netUDPCancelButton; @property (readwrite, weak) IBOutlet NSButton *netUDPOKButton; -@property (readwrite, weak) IBOutlet NSWindow *netUDPPanel; +@property (readwrite) IBOutlet NSWindow *netUDPPanel; @property (readwrite, weak) IBOutlet NSTextField *netUDPPortTextField; @property (readwrite, weak) IBOutlet NSTextField *netUDPPortLabel; @property (readwrite, weak) IBOutlet NSStepper *netUDPPortStepper; diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 593cc6c..a149518 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -51,11 +51,11 @@ @property (readwrite, weak) IBOutlet NSButtonCell *audio_autosavevol_noButtonCell; // hotkeys pane +@property (readwrite) IBOutlet NSWindow *hotkeys_change_win; @property (readwrite, weak) IBOutlet NSButton *hotkeys_changeButton; @property (readwrite, weak) IBOutlet NSTextField *hotkeys_changeLabel; @property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_keysLabel; @property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_takenLabel; -@property (readwrite, weak) IBOutlet NSWindow *hotkeys_change_win; @property (readwrite, weak) IBOutlet NSButton *hotkeys_change_cancelButton; @property (readwrite, weak) IBOutlet NSButton *hotkeys_change_okButton; @property (readwrite, weak) IBOutlet NSButton *hotkeys_clearButton; @@ -201,7 +201,7 @@ @property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_sftpPopup; @property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_smbPopup; @property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_udpPopup; -@property (readwrite, weak) IBOutlet NSWindow *urlhandler_win; +@property (readwrite) IBOutlet NSWindow *urlhandler_win; /* toolbar */ - (NSToolbarItem *)toolbar:(NSToolbar *)o_toolbar ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Remove teletext case from MainMenu validation
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Sun Jun 19
12:55:06 2016 +0200| [e961f02bfbce28a0e6e28ef93efff288d9504cb0] | committer:
Jean-Baptiste Kempf
macosx: Remove teletext case from MainMenu validation
It seems the teletext menu item validation special case is not
necessary at all anymore.
If the parent item is disabled, it does not seem to matter if the
subitems are enabled or not, as access to the subitems is not possible
when the parent is disabled.
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e961f02bfbce28a0e6e28ef93efff288d9504cb0
---
modules/gui/macosx/MainMenu.m | 11 ---
1 file changed, 11 deletions(-)
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index cfb679b..030aa48 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -1630,17 +1630,6 @@
bEnabled = _openSubtitleFile.isEnabled;
}
-/* Special case for telx menu */
-if ([title isEqualToString: _NS("Normal Size")]) {
-NSMenuItem *item = [[mi menu] itemWithTitle:_NS("Teletext")];
-bool b_telx = p_input && var_GetInteger(p_input, "teletext-es") >= 0;
-
-[[item submenu] setAutoenablesItems:NO];
-
-for (int k=0; k < [[item submenu] numberOfItems]; k++)
-[[[item submenu] itemAtIndex:k] setEnabled: b_telx];
-}
-
if (p_input)
vlc_object_release(p_input);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Improve VLCStatusBarIcon class
vlc | branch: master | epira...@gmail.com <epira...@gmail.com> | Sun May 8
01:45:26 2016 +0200| [3ba702e21c6e180bf8a94ac04edf3a50b53f05be] | committer:
Jean-Baptiste Kempf
macosx: Improve VLCStatusBarIcon class
Use actual references to the MenuItems instead of finding them using tags.
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3ba702e21c6e180bf8a94ac04edf3a50b53f05be
---
modules/gui/macosx/VLCStatusBarIcon.m | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/modules/gui/macosx/VLCStatusBarIcon.m
b/modules/gui/macosx/VLCStatusBarIcon.m
index ee8f47d..f9e3484 100644
--- a/modules/gui/macosx/VLCStatusBarIcon.m
+++ b/modules/gui/macosx/VLCStatusBarIcon.m
@@ -35,9 +35,6 @@
#pragma mark -
#pragma mark Defines
-#define playPauseMenuItemTag 74747
-#define stopMenuItemTag 83838
-#define randomMenuItemTag 63636
#define dataUpdateTimerInterval 1.0
#define NSInitialToolTipDelayIn_ms 20
// #define showURLInToolTip 1
@@ -123,8 +120,7 @@
_menuImagePause = [NSImage imageNamed:@"pauseIcon"];
_menuImageStop = [NSImage imageNamed:@"stopIcon"];
-NSMenuItem *menuItemToChange = [_vlcStatusBarIconMenu
itemWithTag:stopMenuItemTag];
-[menuItemToChange setImage:_menuImageStop];
+[stopItem setImage:_menuImageStop];
// I'd rather not use a timer and only update when mouse comes near
// status icon in bar. But one can't tell without evil sourcery :(
@@ -314,12 +310,10 @@
playlist_t *p_playlist = pl_Get(getIntf());
b_value = var_GetBool(p_playlist, "random");
-// get menuitem 'Random'
-NSMenuItem* menuItemToChange = [_vlcStatusBarIconMenu
itemWithTag:randomMenuItemTag];
if (b_value) {
-[menuItemToChange setState:NSOnState];
+[randItem setState:NSOnState];
} else {
-[menuItemToChange setState:NSOffState];
+[randItem setState:NSOffState];
}
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
