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
ed3227e6
Commit
ed3227e6
authored
Sep 13, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix macosx gui compilation (shame on me i broke it in [21943])
parent
bfa9e5bb
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
44 additions
and
42 deletions
+44
-42
modules/gui/macosx/AppleRemote.h
modules/gui/macosx/AppleRemote.h
+5
-4
modules/gui/macosx/AppleRemote.m
modules/gui/macosx/AppleRemote.m
+1
-0
modules/gui/macosx/about.h
modules/gui/macosx/about.h
+2
-2
modules/gui/macosx/applescript.h
modules/gui/macosx/applescript.h
+1
-1
modules/gui/macosx/bookmarks.h
modules/gui/macosx/bookmarks.h
+2
-2
modules/gui/macosx/controls.h
modules/gui/macosx/controls.h
+2
-2
modules/gui/macosx/extended.h
modules/gui/macosx/extended.h
+6
-6
modules/gui/macosx/eyetv.h
modules/gui/macosx/eyetv.h
+1
-1
modules/gui/macosx/fspanel.h
modules/gui/macosx/fspanel.h
+4
-4
modules/gui/macosx/misc.h
modules/gui/macosx/misc.h
+2
-2
modules/gui/macosx/open.h
modules/gui/macosx/open.h
+1
-1
modules/gui/macosx/playlist.h
modules/gui/macosx/playlist.h
+1
-1
modules/gui/macosx/playlistinfo.h
modules/gui/macosx/playlistinfo.h
+1
-1
modules/gui/macosx/prefs.h
modules/gui/macosx/prefs.h
+1
-1
modules/gui/macosx/prefs_widgets.h
modules/gui/macosx/prefs_widgets.h
+1
-1
modules/gui/macosx/sfilters.h
modules/gui/macosx/sfilters.h
+2
-2
modules/gui/macosx/wizard.h
modules/gui/macosx/wizard.h
+11
-11
No files found.
modules/gui/macosx/AppleRemote.h
View file @
ed3227e6
...
...
@@ -86,23 +86,23 @@ The class is not thread safe
IOHIDQueueInterface
**
queue
;
NSMutableArray
*
allCookies
;
NSMutableDictionary
*
cookieToButtonMapping
;
BOOL
openInExclusiveMode
;
BOOL
simulatePlusMinusHold
;
BOOL
processesBacklog
;
/* state for simulating plus/minus hold */
BOOL
lastEventSimulatedHold
;
AppleRemoteEventIdentifier
lastPlusMinusEvent
;
NSTimeInterval
lastPlusMinusEventTime
;
int
remoteId
;
unsigned
int
clickCountEnabledButtons
;
NSTimeInterval
maxClickTimeDifference
;
NSTimeInterval
lastClickCountEventTime
;
AppleRemoteEventIdentifier
lastClickCountEvent
;
unsigned
int
eventClickCount
;
IBOutlet
id
delegate
;
}
...
...
@@ -196,3 +196,4 @@ The class is not thread safe
-
(
id
)
initWithApplicationDelegate
:
(
id
)
delegate
;
-
(
id
)
applicationDelegate
;
@end
modules/gui/macosx/AppleRemote.m
View file @
ed3227e6
...
...
@@ -713,3 +713,4 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
[
invocation
invokeWithTarget
:
applicationDelegate
];
}
@end
modules/gui/macosx/about.h
View file @
ed3227e6
...
...
@@ -32,13 +32,13 @@
IBOutlet
id
o_copyright_field
;
IBOutlet
id
o_credits_textview
;
IBOutlet
id
o_credits_scrollview
;
NSTimer
*
o_scroll_timer
;
float
f_current
;
float
f_end
;
NSTimeInterval
i_start
;
BOOL
b_restart
;
NSString
*
o_credits_path
;
NSString
*
o_credits
;
NSString
*
o_thanks
;
...
...
modules/gui/macosx/applescript.h
View file @
ed3227e6
...
...
@@ -40,4 +40,4 @@
-
(
BOOL
)
scriptFullscreenMode
;
-
(
void
)
setScriptFullscreenMode
:
(
BOOL
)
mode
;
@end
modules/gui/macosx/bookmarks.h
View file @
ed3227e6
...
...
@@ -34,7 +34,7 @@
IBOutlet
id
o_btn_extract
;
IBOutlet
id
o_btn_rm
;
IBOutlet
id
o_tbl_dataTable
;
/* edit window */
IBOutlet
id
o_edit_window
;
IBOutlet
id
o_edit_btn_ok
;
...
...
@@ -45,7 +45,7 @@
IBOutlet
id
o_edit_fld_name
;
IBOutlet
id
o_edit_fld_time
;
IBOutlet
id
o_edit_fld_bytes
;
input_thread_t
*
p_old_input
;
}
...
...
modules/gui/macosx/controls.h
View file @
ed3227e6
...
...
@@ -35,7 +35,7 @@
IBOutlet
id
o_btn_fullscreen
;
IBOutlet
id
o_volumeslider
;
IBOutlet
id
o_btn_shuffle
;
IBOutlet
id
o_btn_addNode
;
IBOutlet
id
o_btn_repeat
;
...
...
@@ -48,7 +48,7 @@
IBOutlet
id
o_specificTime_sec_lbl
;
IBOutlet
id
o_specificTime_stepper
;
IBOutlet
id
o_specificTime_mi
;
VLCFSPanel
*
o_fs_panel
;
}
...
...
modules/gui/macosx/extended.h
View file @
ed3227e6
...
...
@@ -35,7 +35,7 @@
IBOutlet
id
o_audioFlts_view
;
IBOutlet
id
o_videoFilters_view
;
IBOutlet
id
o_extended_window
;
/* window content */
IBOutlet
id
o_expBtn_adjustImage
;
IBOutlet
id
o_expBtn_audioFlts
;
...
...
@@ -48,7 +48,7 @@
IBOutlet
id
o_box_vidFlts
;
IBOutlet
id
o_box_audFlts
;
IBOutlet
id
o_box_adjImg
;
/* video filters */
IBOutlet
id
o_btn_vidFlts_mrInfo
;
IBOutlet
id
o_ckb_blur
;
...
...
@@ -63,13 +63,13 @@
IBOutlet
id
o_ckb_gradient
;
IBOutlet
id
o_lbl_general
;
IBOutlet
id
o_lbl_distort
;
/* audio filters */
IBOutlet
id
o_ckb_vlme_norm
;
IBOutlet
id
o_ckb_hdphnVirt
;
IBOutlet
id
o_lbl_maxLevel
;
IBOutlet
id
o_sld_maxLevel
;
/* adjust image */
IBOutlet
id
o_btn_rstrDefaults
;
IBOutlet
id
o_ckb_enblAdjustImg
;
...
...
@@ -85,12 +85,12 @@
IBOutlet
id
o_sld_hue
;
IBOutlet
id
o_sld_saturation
;
IBOutlet
id
o_sld_opaque
;
/* global variables */
BOOL
o_adjImg_expanded
;
BOOL
o_audFlts_expanded
;
BOOL
o_vidFlts_expanded
;
BOOL
o_config_changed
;
}
...
...
modules/gui/macosx/eyetv.h
View file @
ed3227e6
...
...
@@ -24,7 +24,7 @@
#import <Cocoa/Cocoa.h>
@interface
VLCEyeTVController
:
NSObject
@interface
VLCEyeTVController
:
NSObject
{
BOOL
b_eyeTVactive
;
BOOL
b_deviceConnected
;
...
...
modules/gui/macosx/fspanel.h
View file @
ed3227e6
...
...
@@ -11,7 +11,7 @@
* 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
...
...
@@ -36,8 +36,8 @@
BOOL
b_voutWasUpdated
;
int
i_device
;
}
-
(
id
)
initWithContentRect
:
(
NSRect
)
contentRect
styleMask
:
(
unsigned
int
)
aStyle
-
(
id
)
initWithContentRect
:
(
NSRect
)
contentRect
styleMask
:
(
unsigned
int
)
aStyle
backing
:
(
NSBackingStoreType
)
bufferingType
defer
:
(
BOOL
)
flag
;
-
(
void
)
awakeFromNib
;
...
...
@@ -87,7 +87,7 @@
-
(
void
)
setPause
;
-
(
void
)
setStreamTitle
:
(
NSString
*
)
o_title
;
-
(
void
)
setStreamPos
:
(
float
)
f_pos
andTime
:
(
NSString
*
)
o_time
;
-
(
void
)
setSeekable
:
(
BOOL
)
b_seekable
;
-
(
void
)
setSeekable
:
(
BOOL
)
b_seekable
;
-
(
void
)
setVolumeLevel
:
(
float
)
f_volumeLevel
;
-
(
IBAction
)
play
:(
id
)
sender
;
-
(
IBAction
)
prev
:(
id
)
sender
;
...
...
modules/gui/macosx/misc.h
View file @
ed3227e6
...
...
@@ -124,7 +124,7 @@
/*****************************************************************************
* ITSliderCell
*****************************************************************************/
@interface
ITSlider
:
NSSlider
{
}
...
...
@@ -134,7 +134,7 @@
/*****************************************************************************
* ITSliderCell
*****************************************************************************/
@interface
ITSliderCell
:
NSSliderCell
{
NSImage
*
_knobOff
;
...
...
modules/gui/macosx/open.h
View file @
ed3227e6
...
...
@@ -114,7 +114,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet
id
o_eyetv_noEyeTV_lbl
;
IBOutlet
id
o_eyetv_noEyeTVLong_lbl
;
IBOutlet
id
o_eyetv_previousProgram_btn
;
BOOL
b_autoplay
;
}
...
...
modules/gui/macosx/playlist.h
View file @
ed3227e6
...
...
@@ -107,7 +107,7 @@
BOOL
b_selected_item_met
;
BOOL
b_isSortDescending
;
id
o_tc_sortColumn
;
/* "add node" button and menu entry */
IBOutlet
id
o_mi_addNode
;
IBOutlet
id
o_btn_addNode
;
...
...
modules/gui/macosx/playlistinfo.h
View file @
ed3227e6
...
...
@@ -41,7 +41,7 @@
IBOutlet
id
o_btn_delete_group
;
IBOutlet
id
o_btn_add_group
;
IBOutlet
id
o_outline_view
;
IBOutlet
id
o_tab_view
;
IBOutlet
id
o_collection_lbl
;
...
...
modules/gui/macosx/prefs.h
View file @
ed3227e6
...
...
@@ -57,7 +57,7 @@
VLCTreeItem
*
o_config_tree
;
NSView
*
o_empty_view
;
NSMutableDictionary
*
o_save_prefs
;
IBOutlet
id
o_prefs_window
;
IBOutlet
id
o_title
;
IBOutlet
id
o_tree
;
...
...
modules/gui/macosx/prefs_widgets.h
View file @
ed3227e6
...
...
@@ -202,7 +202,7 @@ static NSMenu *o_keys_menu = nil;
-
(
id
)
initWithItem
:
(
module_config_t
*
)
_p_item
withView
:
(
NSView
*
)
o_parent_view
;
@end
//#undef CONFIG_ITEM_LIST_STRING
...
...
modules/gui/macosx/sfilters.h
View file @
ed3227e6
...
...
@@ -40,7 +40,7 @@
IBOutlet
id
o_logo_opaque_sld
;
IBOutlet
id
o_logo_pos_lbl
;
IBOutlet
id
o_logo_pos_radio
;
/* marquee section */
IBOutlet
id
o_marq_enabled_ckb
;
IBOutlet
id
o_marq_color_lbl
;
...
...
@@ -71,7 +71,7 @@
IBOutlet
id
o_time_size_pop
;
IBOutlet
id
o_time_stamp_fld
;
IBOutlet
id
o_time_stamp_lbl
;
BOOL
o_config_changed
;
BOOL
o_save_settings
;
NSArray
*
o_colors
;
...
...
modules/gui/macosx/wizard.h
View file @
ed3227e6
...
...
@@ -24,7 +24,7 @@
/*****************************************************************************
* VLCWizard
*****************************************************************************/
#import <Cocoa/Cocoa.h>
@interface
VLCWizard
:
NSObject
...
...
@@ -36,7 +36,7 @@
IBOutlet
id
o_tab_pageHolder
;
IBOutlet
id
o_wizard_window
;
IBOutlet
id
o_playlist_wizard
;
/* page one ("Hello") */
IBOutlet
id
o_t1_btn_mrInfo_strmg
;
IBOutlet
id
o_t1_btn_mrInfo_trnscd
;
...
...
@@ -44,7 +44,7 @@
IBOutlet
id
o_t1_txt_notice
;
IBOutlet
id
o_t1_txt_text
;
IBOutlet
id
o_t1_txt_title
;
/* page two ("Input") */
IBOutlet
id
o_t2_box_prtExtrct
;
IBOutlet
id
o_t2_ckb_enblPartExtrct
;
...
...
@@ -58,7 +58,7 @@
IBOutlet
id
o_t2_title
;
IBOutlet
id
o_t2_txt_prtExtrctFrom
;
IBOutlet
id
o_t2_txt_prtExtrctTo
;
/* page one ("Streaming 1") */
IBOutlet
id
o_t3_box_dest
;
IBOutlet
id
o_t3_box_strmgMthd
;
...
...
@@ -68,7 +68,7 @@
IBOutlet
id
o_t3_txt_text
;
IBOutlet
id
o_t3_txt_title
;
IBOutlet
id
o_t3_txt_strgMthdInfo
;
/* page four ("Transcode 1") */
IBOutlet
id
o_t4_box_audio
;
IBOutlet
id
o_t4_box_video
;
...
...
@@ -86,12 +86,12 @@
IBOutlet
id
o_t4_txt_videoCodec
;
IBOutlet
id
o_t4_txt_hintAudio
;
IBOutlet
id
o_t4_txt_hintVideo
;
/* page five ("Encap") */
IBOutlet
id
o_t5_matrix_encap
;
IBOutlet
id
o_t5_text
;
IBOutlet
id
o_t5_title
;
/* page six ("Streaming 2") */
IBOutlet
id
o_t6_ckb_sap
;
IBOutlet
id
o_t6_fld_sap
;
...
...
@@ -104,7 +104,7 @@
IBOutlet
id
o_t6_btn_mrInfo_local
;
IBOutlet
id
o_t6_ckb_soverlay
;
IBOutlet
id
o_t6_ckb_local
;
/* page seven ("Transcode 2") */
IBOutlet
id
o_t7_btn_chooseFile
;
IBOutlet
id
o_t7_fld_filePath
;
...
...
@@ -114,7 +114,7 @@
IBOutlet
id
o_t7_btn_mrInfo_local
;
IBOutlet
id
o_t7_ckb_soverlay
;
IBOutlet
id
o_t7_ckb_local
;
/* page eight ("Summary") */
IBOutlet
id
o_t8_fld_destination
;
IBOutlet
id
o_t8_fld_encapFormat
;
...
...
@@ -144,14 +144,14 @@
IBOutlet
id
o_t8_txt_ttl
;
IBOutlet
id
o_t8_txt_mrl
;
IBOutlet
id
o_t8_txt_local
;
NSMutableDictionary
*
o_userSelections
;
NSArray
*
o_videoCodecs
;
NSArray
*
o_audioCodecs
;
NSArray
*
o_encapFormats
;
NSArray
*
o_strmgMthds
;
NSString
*
o_opts
;
BOOL
b_keepSettingsOrNot
;
}
-
(
IBAction
)
cancelRun
:(
id
)
sender
;
...
...
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