Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
21445d78
Commit
21445d78
authored
Nov 26, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* fspanel usability fixes (forward-port of [18077]) plus some further clean up
parent
7614e4ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
modules/gui/macosx/equalizer.m
modules/gui/macosx/equalizer.m
+2
-2
modules/gui/macosx/fspanel.h
modules/gui/macosx/fspanel.h
+5
-0
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+8
-1
No files found.
modules/gui/macosx/equalizer.m
View file @
21445d78
...
@@ -177,7 +177,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
...
@@ -177,7 +177,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
char
*
psz_bands
,
*
psz_bands_init
,
*
p_next
;
char
*
psz_bands
,
*
psz_bands_init
,
*
p_next
;
vlc_bool_t
b_2p
;
vlc_bool_t
b_2p
;
int
i
;
int
i
;
vlc_bool_t
b_enabled
=
GetFiltersStatus
(
p_intf
,
"equalizer"
);
vlc_bool_t
b_enabled
=
GetFiltersStatus
(
p_intf
,
(
char
*
)
"equalizer"
);
vlc_object_t
*
p_object
=
vlc_object_find
(
p_intf
,
vlc_object_t
*
p_object
=
vlc_object_find
(
p_intf
,
VLC_OBJECT_AOUT
,
FIND_ANYWHERE
);
VLC_OBJECT_AOUT
,
FIND_ANYWHERE
);
...
@@ -320,7 +320,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
...
@@ -320,7 +320,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
-
(
IBAction
)
enable
:(
id
)
sender
-
(
IBAction
)
enable
:(
id
)
sender
{
{
ChangeFiltersString
(
VLCIntf
,
"equalizer"
,
[
sender
state
]
);
ChangeFiltersString
(
VLCIntf
,
(
char
*
)
"equalizer"
,
[
sender
state
]
);
}
}
-
(
IBAction
)
preampSliderUpdated
:(
id
)
sender
-
(
IBAction
)
preampSliderUpdated
:(
id
)
sender
...
...
modules/gui/macosx/fspanel.h
View file @
21445d78
...
@@ -30,6 +30,9 @@
...
@@ -30,6 +30,9 @@
BOOL
b_keptVisible
;
BOOL
b_keptVisible
;
BOOL
b_alreadyCounting
;
BOOL
b_alreadyCounting
;
int
i_timeToKeepVisibleInSec
;
int
i_timeToKeepVisibleInSec
;
BOOL
b_displayed
;
BOOL
b_voutWasUpdated
;
}
}
-
(
id
)
initWithContentRect
:
(
NSRect
)
contentRect
-
(
id
)
initWithContentRect
:
(
NSRect
)
contentRect
styleMask
:
(
unsigned
int
)
aStyle
styleMask
:
(
unsigned
int
)
aStyle
...
@@ -61,6 +64,8 @@
...
@@ -61,6 +64,8 @@
-
(
void
)
mouseDown
:(
NSEvent
*
)
theEvent
;
-
(
void
)
mouseDown
:(
NSEvent
*
)
theEvent
;
-
(
void
)
mouseDragged
:(
NSEvent
*
)
theEvent
;
-
(
void
)
mouseDragged
:(
NSEvent
*
)
theEvent
;
-
(
BOOL
)
isDisplayed
;
-
(
void
)
setVoutWasUpdated
;
@end
@end
@interface
VLCFSPanelView
:
NSView
@interface
VLCFSPanelView
:
NSView
...
...
modules/gui/macosx/vout.m
View file @
21445d78
...
@@ -668,7 +668,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -668,7 +668,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t
value_drawable
;
vlc_value_t
value_drawable
;
int
i_timeout
;
int
i_timeout
;
id
o_return
=
nil
;
id
o_return
=
nil
;
vout_thread_t
*
p_real_vout
=
[
VLCVoutView
getRealVout
:
p_vout
];
var_Get
(
p_vout
->
p_libvlc
,
"drawable"
,
&
value_drawable
);
var_Get
(
p_vout
->
p_libvlc
,
"drawable"
,
&
value_drawable
);
...
@@ -947,6 +946,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -947,6 +946,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if
(
p_vout
->
b_fullscreen
)
if
(
p_vout
->
b_fullscreen
)
{
{
/* move the FSPanel to front in case that it is currently shown
* this won't and is not supposed to work when it's fading right now */
if
(
[[[[
VLCMain
sharedInstance
]
getControls
]
getFSPanel
]
isDisplayed
]
)
[[[[
VLCMain
sharedInstance
]
getControls
]
getFSPanel
]
orderFront
:
self
];
/* tell the fspanel to move itself to front next time it's triggered */
[[[[
VLCMain
sharedInstance
]
getControls
]
getFSPanel
]
setVoutWasUpdated
];
CGDisplayFadeReservationToken
token
;
CGDisplayFadeReservationToken
token
;
NSRect
screen_rect
=
[
o_screen
frame
];
NSRect
screen_rect
=
[
o_screen
frame
];
screen_rect
.
origin
.
x
=
screen_rect
.
origin
.
y
=
0
;
screen_rect
.
origin
.
x
=
screen_rect
.
origin
.
y
=
0
;
...
...
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