Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
d53d9b9d
Commit
d53d9b9d
authored
Jun 07, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* control/*.c: use var_Set/Get "state"/"position"/"rate" instead of old functions.
parent
4f49b52c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
35 deletions
+39
-35
modules/control/corba/mediacontrol-core.c
modules/control/corba/mediacontrol-core.c
+30
-28
modules/control/joystick.c
modules/control/joystick.c
+7
-6
modules/control/lirc.c
modules/control/lirc.c
+2
-1
No files found.
modules/control/corba/mediacontrol-core.c
View file @
d53d9b9d
...
...
@@ -330,6 +330,11 @@ mediacontrol_set_media_position(mediacontrol_Instance *self,
return
;
}
/* FIXME FIXME FIXME input_Seek is deprecated, and I don't know how to fix that --fenrir */
/* You need to do a var_SetFloat( p_input, pos ); where pos is a float between 0.0 and 1.0 */
RAISE
(
mediacontrol_InvalidPosition
,
"mediacontrol_set_media_position is not usable for now"
);
return
#if 0
l_offset_destination = a_position->value;
i_whence |= INPUT_SEEK_BYTES;
...
...
@@ -358,6 +363,7 @@ mediacontrol_set_media_position(mediacontrol_Instance *self,
function (cf input_ext-intf.c) */
input_Seek (p_input, l_offset_destination, i_whence);
return;
#endif
}
/* Starts playing a stream */
...
...
@@ -409,14 +415,12 @@ mediacontrol_pause(mediacontrol_Instance *self,
exception
=
mediacontrol_exception_init
(
exception
);
if
(
p_input
!=
NULL
)
{
input_SetStatus
(
p_input
,
INPUT_STATUS_PAUSE
);
var_SetInteger
(
p_input
,
"state"
,
PAUSE_S
);
}
else
{
RAISE
(
mediacontrol_InternalException
,
"No input"
);
}
return
;
}
void
...
...
@@ -430,14 +434,12 @@ mediacontrol_resume(mediacontrol_Instance *self,
exception
=
mediacontrol_exception_init
(
exception
);
if
(
p_input
!=
NULL
)
{
input_SetStatus
(
p_input
,
INPUT_STATUS_PAUSE
);
var_SetInteger
(
p_input
,
"state"
,
PAUSE_S
);
}
else
{
RAISE
(
mediacontrol_InternalException
,
"No input"
);
}
return
;
}
void
...
...
modules/control/joystick.c
View file @
d53d9b9d
...
...
@@ -547,8 +547,8 @@ static int Forward(intf_thread_t *p_intf)
if
(
p_intf
->
p_sys
->
p_input
)
{
msg_Dbg
(
p_intf
,
"seeking %f seconds"
,
p_intf
->
p_sys
->
f_seconds
);
input_Seek
(
p_intf
->
p_sys
->
p_input
,
p_intf
->
p_sys
->
f_seconds
,
INPUT_SEEK_SECONDS
|
INPUT_SEEK_CUR
);
var_SetTime
(
p_intf
->
p_sys
->
p_input
,
"time-offset"
,
(
int64_t
)
p_intf
->
p_sys
->
f_seconds
*
I64C
(
1000000
)
);
return
0
;
}
return
-
1
;
...
...
@@ -560,8 +560,9 @@ static int Back(intf_thread_t *p_intf)
if
(
p_intf
->
p_sys
->
p_input
)
{
msg_Dbg
(
p_intf
,
"seeking -%f seconds"
,
p_intf
->
p_sys
->
f_seconds
);
input_Seek
(
p_intf
->
p_sys
->
p_input
,
-
(
p_intf
->
p_sys
->
f_seconds
),
INPUT_SEEK_SECONDS
|
INPUT_SEEK_CUR
);
var_SetTime
(
p_intf
->
p_sys
->
p_input
,
"time-offset"
,
-
(
int64_t
)
p_intf
->
p_sys
->
f_seconds
*
I64C
(
1000000
)
);
return
0
;
}
return
-
1
;
...
...
@@ -572,7 +573,7 @@ static int Play(intf_thread_t *p_intf)
{
if
(
p_intf
->
p_sys
->
p_input
)
{
input_SetStatus
(
p_intf
->
p_sys
->
p_input
,
INPUT_STATUS_PAUSE
);
var_SetInteger
(
p_input
,
"state"
,
PAUSE_S
);
return
0
;
}
return
-
1
;
...
...
modules/control/lirc.c
View file @
d53d9b9d
...
...
@@ -481,7 +481,8 @@ static void Run( intf_thread_t *p_intf )
p_input
->
stream
.
p_selected_area
->
i_part
=
i_chapter
;
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
input_ChangeArea
(
p_input
,
p_area
);
input_SetStatus
(
p_input
,
INPUT_STATUS_PLAY
);
var_SetInteger
(
p_input
,
"state"
,
PLAYING_S
);
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
}
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
...
...
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