Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
09758763
Commit
09758763
authored
Feb 02, 2014
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix recursive inclusion of the compatibility header
parent
eecfe431
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
23 additions
and
22 deletions
+23
-22
modules/gui/macosx/ControlsBar.h
modules/gui/macosx/ControlsBar.h
+1
-2
modules/gui/macosx/ControlsBar.m
modules/gui/macosx/ControlsBar.m
+2
-1
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+1
-2
modules/gui/macosx/PXSourceList.h
modules/gui/macosx/PXSourceList.h
+0
-1
modules/gui/macosx/PXSourceList.m
modules/gui/macosx/PXSourceList.m
+1
-0
modules/gui/macosx/VLCUIWidgets.h
modules/gui/macosx/VLCUIWidgets.h
+1
-2
modules/gui/macosx/VLCUIWidgets.m
modules/gui/macosx/VLCUIWidgets.m
+2
-1
modules/gui/macosx/VLCVoutWindowController.h
modules/gui/macosx/VLCVoutWindowController.h
+1
-2
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+2
-1
modules/gui/macosx/VideoView.m
modules/gui/macosx/VideoView.m
+2
-1
modules/gui/macosx/Windows.h
modules/gui/macosx/Windows.h
+1
-2
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+2
-1
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+1
-2
modules/gui/macosx/misc.h
modules/gui/macosx/misc.h
+1
-2
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+2
-1
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+3
-1
No files found.
modules/gui/macosx/ControlsBar.h
View file @
09758763
/*****************************************************************************
* ControlsBar.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012 VLC authors and VideoLAN
* Copyright (C) 2012
-2014
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -23,7 +23,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "misc.h"
@class
VLCFSPanel
;
...
...
modules/gui/macosx/ControlsBar.m
View file @
09758763
/*****************************************************************************
* ControlsBar.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-201
3
VLC authors and VideoLAN
* Copyright (C) 2012-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -27,6 +27,7 @@
#import "CoreInteraction.h"
#import "MainMenu.h"
#import "fspanel.h"
#import "CompatibilityFixes.h"
/*****************************************************************************
* VLCControlsBarCommon
...
...
modules/gui/macosx/MainWindow.h
View file @
09758763
/*****************************************************************************
* MainWindow.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-201
3
VLC authors and VideoLAN
* Copyright (C) 2002-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -26,7 +26,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "PXSourceList.h"
#import "PXSourceListDataSource.h"
...
...
modules/gui/macosx/PXSourceList.h
View file @
09758763
...
...
@@ -7,7 +7,6 @@
//
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "PXSourceListDelegate.h"
#import "PXSourceListDataSource.h"
...
...
modules/gui/macosx/PXSourceList.m
View file @
09758763
...
...
@@ -8,6 +8,7 @@
// GC-enabled code revised by Stefan Vogt http://byteproject.net
//
#import "CompatibilityFixes.h"
#import "PXSourceList.h"
#import "SideBarItem.h"
...
...
modules/gui/macosx/VLCUIWidgets.h
View file @
09758763
/*****************************************************************************
* VLCUIWidgets.h: Widgets for VLC's extensions dialogs for Mac OS X
*****************************************************************************
* Copyright (C) 2009-201
2
the VideoLAN team and authors
* Copyright (C) 2009-201
4
the VideoLAN team and authors
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan dot>,
...
...
@@ -23,7 +23,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import <vlc_extensions.h>
@class
VLCDialogGridView
;
...
...
modules/gui/macosx/VLCUIWidgets.m
View file @
09758763
/*****************************************************************************
* VLCUIWidgets.m: Widgets for VLC's extensions dialogs for Mac OS X
*****************************************************************************
* Copyright (C) 2009-201
2
the VideoLAN team and authors
* Copyright (C) 2009-201
4
the VideoLAN team and authors
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan dot>,
...
...
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "CompatibilityFixes.h"
#import "VLCUIWidgets.h"
#import <stdlib.h>
...
...
modules/gui/macosx/VLCVoutWindowController.h
View file @
09758763
/*****************************************************************************
* VLCVoutWindowController.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-201
3
VLC authors and VideoLAN
* Copyright (C) 2012-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -23,7 +23,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import <vlc_vout_window.h>
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
09758763
/*****************************************************************************
* VLCVoutWindowController.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-201
3
VLC authors and VideoLAN
* Copyright (C) 2012-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "CompatibilityFixes.h"
#import "VLCVoutWindowController.h"
#import "intf.h"
#import "MainWindow.h"
...
...
modules/gui/macosx/VideoView.m
View file @
09758763
/*****************************************************************************
* VideoView.m: MacOS X video output module
*****************************************************************************
* Copyright (C) 2002-201
3
VLC authors and VideoLAN
* Copyright (C) 2002-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
...
...
@@ -32,6 +32,7 @@
#import <stdlib.h>
/* free() */
#import <string.h>
#import "CompatibilityFixes.h"
#import "intf.h"
#import "VideoView.h"
#import "CoreInteraction.h"
...
...
modules/gui/macosx/Windows.h
View file @
09758763
/*****************************************************************************
* Windows.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-201
3
VLC authors and VideoLAN
* Copyright (C) 2012-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -23,7 +23,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
/*****************************************************************************
* VLCWindow
...
...
modules/gui/macosx/Windows.m
View file @
09758763
/*****************************************************************************
* Windows.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2012-201
3
VLC authors and VideoLAN
* Copyright (C) 2012-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...
...
@@ -27,6 +27,7 @@
#import "CoreInteraction.h"
#import "ControlsBar.h"
#import "VideoView.h"
#import "CompatibilityFixes.h"
/*****************************************************************************
* VLCWindow
...
...
modules/gui/macosx/intf.h
View file @
09758763
/*****************************************************************************
* intf.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-201
3
VLC authors and VideoLAN
* Copyright (C) 2002-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...
...
@@ -38,7 +38,6 @@
#import <vlc_vout_window.h>
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
#import "SPMediaKeyTap.h"
/* for the media key support */
#import "misc.h"
#import "MainWindow.h"
...
...
modules/gui/macosx/misc.h
View file @
09758763
/*****************************************************************************
* misc.h: code not specific to vlc
*****************************************************************************
* Copyright (C) 2003-201
3
VLC authors and VideoLAN
* Copyright (C) 2003-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...
...
@@ -23,7 +23,6 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "CompatibilityFixes.h"
/*****************************************************************************
* NSSound (VLCAdditions)
...
...
modules/gui/macosx/misc.m
View file @
09758763
/*****************************************************************************
* misc.m: code not specific to vlc
*****************************************************************************
* Copyright (C) 2003-201
3
VLC authors and VideoLAN
* Copyright (C) 2003-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...
...
@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "CompatibilityFixes.h"
#import "misc.h"
#import "intf.h"
/* VLCApplication */
#import "MainWindow.h"
...
...
modules/gui/macosx/playlist.m
View file @
09758763
/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-201
3
VLC authors and VideoLAN
* Copyright (C) 2002-201
4
VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...
...
@@ -39,6 +39,8 @@
#include <math.h>
#include <sys/mount.h>
#import "CompatibilityFixes.h"
#import "intf.h"
#import "wizard.h"
#import "bookmarks.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment