Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
a55eb27d
Commit
a55eb27d
authored
Mar 13, 2005
by
Jérome Decoodt
Browse files
Added setScrollField: and resetScrollField to manage the scroll field.
parent
146736b5
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/gui/macosx/controls.m
View file @
a55eb27d
...
...
@@ -247,17 +247,27 @@
{
intf_thread_t
*
p_intf
=
VLCIntf
;
audio_volume_t
i_volume
=
(
audio_volume_t
)[
sender
intValue
];
aout_VolumeSet
(
p_intf
,
i_volume
*
AOUT_VOLUME_STEP
);
[
self
updateVolumeSlider
];
}
-
(
void
)
updateVolumeSlider
{
NSString
*
o_text
;
char
*
psz_text
;
intf_thread_t
*
p_intf
=
VLCIntf
;
audio_volume_t
i_volume
;
aout_VolumeGet
(
p_intf
,
&
i_volume
);
psz_text
=
malloc
(
32
*
sizeof
(
char
)
);
/*FIXME: do we really need to work with a char * before NSString ? */
if
(
psz_text
)
{
sprintf
(
psz_text
,
"Volume: %d"
,
i_volume
*
200
/
AOUT_VOLUME_MAX
);
o_text
=
[[
NSString
alloc
]
initWithCString
:
psz_text
];
[
o_main
setScrollField
:
o_text
stopAfter
:
1000000
];
free
(
psz_text
);
}
[
o_volumeslider
setFloatValue
:
(
float
)(
i_volume
/
AOUT_VOLUME_STEP
)];
}
...
...
modules/gui/macosx/intf.h
View file @
a55eb27d
...
...
@@ -237,6 +237,7 @@ struct intf_sys_t
bool
b_small_window
;
mtime_t
i_end_scroll
;
}
+
(
VLCMain
*
)
sharedInstance
;
...
...
@@ -258,6 +259,8 @@ struct intf_sys_t
-
(
void
)
manage
;
-
(
void
)
manageIntf
:(
NSTimer
*
)
o_timer
;
-
(
void
)
setupMenus
;
-
(
void
)
setScrollField
:(
NSString
*
)
o_string
stopAfter
:(
int
)
timeout
;
-
(
void
)
resetScrollField
;
-
(
void
)
updateMessageArray
;
-
(
void
)
playStatusUpdated
:(
int
)
i_status
;
...
...
modules/gui/macosx/intf.m
View file @
a55eb27d
...
...
@@ -417,7 +417,7 @@ static VLCMain *_o_sharedMainInstance = nil;
-
(
void
)
initStrings
{
[
o_window
setTitle
:
_NS
(
"VLC - Controller"
)];
[
o_scrollfi
el
d
setS
tringValue
:
_NS
(
"VLC media player"
)];
[
s
el
f
setS
crollField
:
_NS
(
"VLC media player"
)
stopAfter
:
-
1
];
/* button controls */
[
o_btn_prev
setToolTip
:
_NS
(
"Previous"
)];
...
...
@@ -755,7 +755,6 @@ static VLCMain *_o_sharedMainInstance = nil;
{
NSDate
*
o_sleep_date
;
playlist_t
*
p_playlist
;
vlc_value_t
val
;
/* new thread requires a new pool */
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
...
...
@@ -797,7 +796,7 @@ static VLCMain *_o_sharedMainInstance = nil;
/* input stopped */
p_intf
->
p_sys
->
b_intf_update
=
VLC_TRUE
;
p_intf
->
p_sys
->
i_play_status
=
END_S
;
[
o_scrollfield
setStringValue
:
_NS
(
"VLC media player"
)
];
[
self
setScrollField
:
_NS
(
"VLC media player"
)
stopAfter
:
-
1
];
vlc_object_release
(
p_input
);
p_input
=
NULL
;
}
...
...
@@ -909,7 +908,7 @@ static VLCMain *_o_sharedMainInstance = nil;
if
(
o_temp
==
NULL
)
o_temp
=
[
NSString
stringWithCString
:
p_playlist
->
status
.
p_item
->
input
.
psz_name
];
[
o_scrollfield
setStringValue
:
o_temp
];
[
self
setScrollField
:
o_temp
stopAfter
:
-
1
];
p_vout
=
vlc_object_find
(
p_intf
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
...
...
@@ -978,6 +977,9 @@ static VLCMain *_o_sharedMainInstance = nil;
[
self
updateMessageArray
];
if
(
(
i_end_scroll
!=
-
1
)
&&
(
mdate
()
>
i_end_scroll
)
)
[
self
resetScrollField
];
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
3
target:
self
selector
:
@selector
(
manageIntf
:
)
userInfo:
nil
repeats
:
FALSE
];
...
...
@@ -1052,6 +1054,41 @@ static VLCMain *_o_sharedMainInstance = nil;
#undef p_input
}
-
(
void
)
setScrollField
:(
NSString
*
)
o_string
stopAfter
:(
int
)
timeout
{
if
(
timeout
!=
-
1
)
i_end_scroll
=
mdate
()
+
timeout
;
else
i_end_scroll
=
-
1
;
[
o_scrollfield
setStringValue
:
o_string
];
}
-
(
void
)
resetScrollField
{
i_end_scroll
=
-
1
;
#define p_input p_intf->p_sys->p_input
if
(
p_input
&&
!
p_input
->
b_die
)
{
NSString
*
o_temp
;
playlist_t
*
p_playlist
=
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
==
NULL
)
{
return
;
}
o_temp
=
[
NSString
stringWithUTF8String
:
p_playlist
->
status
.
p_item
->
input
.
psz_name
];
if
(
o_temp
==
NULL
)
o_temp
=
[
NSString
stringWithCString
:
p_playlist
->
status
.
p_item
->
input
.
psz_name
];
[
self
setScrollField
:
o_temp
stopAfter
:
-
1
];
vlc_object_release
(
p_playlist
);
return
;
}
#undef p_input
[
self
setScrollField
:
_NS
(
"VLC media player"
)
stopAfter
:
-
1
];
}
-
(
void
)
updateMessageArray
{
int
i_start
,
i_stop
;
...
...
Write
Preview
Supports
Markdown
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