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
82147298
Commit
82147298
authored
Jan 16, 2006
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Indentation and coding style fixes
parent
1c112069
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
src/control/mediacontrol_audio_video.c
src/control/mediacontrol_audio_video.c
+11
-12
No files found.
src/control/mediacontrol_audio_video.c
View file @
82147298
...
@@ -93,7 +93,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
...
@@ -93,7 +93,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
p_snapshot
=
(
snapshot_t
*
)
p_cache
->
p_private
;
p_snapshot
=
(
snapshot_t
*
)
p_cache
->
p_private
;
vlc_object_destroy
(
p_cache
);
vlc_object_destroy
(
p_cache
);
if
(
p_snapshot
)
if
(
p_snapshot
)
{
{
p_pic
=
_mediacontrol_createRGBPicture
(
p_snapshot
->
i_width
,
p_pic
=
_mediacontrol_createRGBPicture
(
p_snapshot
->
i_width
,
...
@@ -103,9 +103,9 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
...
@@ -103,9 +103,9 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
p_snapshot
->
p_data
,
p_snapshot
->
p_data
,
p_snapshot
->
i_datasize
);
p_snapshot
->
i_datasize
);
if
(
!
p_pic
)
if
(
!
p_pic
)
RAISE
(
mediacontrol_InternalException
,
"Out of memory"
);
RAISE
(
mediacontrol_InternalException
,
"Out of memory"
);
free
(
p_snapshot
->
p_data
);
free
(
p_snapshot
->
p_data
);
free
(
p_snapshot
);
free
(
p_snapshot
);
}
}
else
else
{
{
...
@@ -198,7 +198,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
...
@@ -198,7 +198,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
end
->
origin
==
mediacontrol_RelativePosition
)
end
->
origin
==
mediacontrol_RelativePosition
)
{
{
mtime_t
i_duration
=
0
;
mtime_t
i_duration
=
0
;
mtime_t
i_now
=
mdate
();
mtime_t
i_now
=
mdate
();
i_duration
=
1000
*
mediacontrol_unit_convert
(
self
->
p_playlist
->
p_input
,
i_duration
=
1000
*
mediacontrol_unit_convert
(
self
->
p_playlist
->
p_input
,
end
->
key
,
end
->
key
,
...
@@ -224,7 +224,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
...
@@ -224,7 +224,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
/* FIXME */
/* FIXME */
/* i_now = input_ClockGetTS( p_input, NULL, 0 ); */
/* i_now = input_ClockGetTS( p_input, NULL, 0 ); */
i_now
=
mdate
();
i_now
=
mdate
();
i_debut
=
mediacontrol_position2microsecond
(
p_input
,
i_debut
=
mediacontrol_position2microsecond
(
p_input
,
(
mediacontrol_Position
*
)
begin
);
(
mediacontrol_Position
*
)
begin
);
i_debut
+=
i_now
;
i_debut
+=
i_now
;
...
@@ -266,14 +266,13 @@ mediacontrol_sound_set_volume( mediacontrol_Instance *self,
...
@@ -266,14 +266,13 @@ mediacontrol_sound_set_volume( mediacontrol_Instance *self,
if
(
!
self
->
p_intf
)
if
(
!
self
->
p_intf
)
{
{
RAISE
(
mediacontrol_InternalException
,
"No interface module"
);
RAISE
(
mediacontrol_InternalException
,
"No interface module"
);
return
;
}
}
aout_VolumeSet
(
self
->
p_intf
,(
audio_volume_t
)
volume
);
else
aout_VolumeSet
(
self
->
p_intf
,(
audio_volume_t
)
volume
);
}
}
vlc_bool_t
mediacontrol_set_visual
(
mediacontrol_Instance
*
self
,
vlc_bool_t
mediacontrol_set_visual
(
mediacontrol_Instance
*
self
,
WINDOWHANDLE
visual_id
,
WINDOWHANDLE
visual_id
,
mediacontrol_Exception
*
exception
)
mediacontrol_Exception
*
exception
)
{
{
vlc_value_t
value
;
vlc_value_t
value
;
int
ret
;
int
ret
;
...
@@ -281,10 +280,10 @@ vlc_bool_t mediacontrol_set_visual( mediacontrol_Instance *self,
...
@@ -281,10 +280,10 @@ vlc_bool_t mediacontrol_set_visual( mediacontrol_Instance *self,
if
(
!
self
->
p_vlc
)
if
(
!
self
->
p_vlc
)
{
{
RAISE
(
mediacontrol_InternalException
,
"No vlc reference"
);
RAISE
(
mediacontrol_InternalException
,
"No vlc reference"
);
return
0
;
return
VLC_FALSE
;
}
}
value
.
i_int
=
visual_id
;
value
.
i_int
=
visual_id
;
ret
=
var_Set
(
self
->
p_vlc
,
"drawable"
,
value
);
ret
=
var_Set
(
self
->
p_vlc
,
"drawable"
,
value
);
return
(
ret
==
VLC_SUCCESS
);
return
(
ret
==
VLC_SUCCESS
);
}
}
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