Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
56b3fdd4
Commit
56b3fdd4
authored
Mar 31, 2009
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup
parent
7b489339
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
17 deletions
+9
-17
modules/video_output/x11/xcommon.h
modules/video_output/x11/xcommon.h
+7
-9
src/control/audio.c
src/control/audio.c
+0
-4
src/control/video.c
src/control/video.c
+2
-4
No files found.
modules/video_output/x11/xcommon.h
View file @
56b3fdd4
...
@@ -225,14 +225,14 @@ struct vout_sys_t
...
@@ -225,14 +225,14 @@ struct vout_sys_t
int
i_vout_event
;
/* 1(Fullsupport), 2(FullscreenOnly), 3(none) */
int
i_vout_event
;
/* 1(Fullsupport), 2(FullscreenOnly), 3(none) */
/* X11 generic properties */
/* X11 generic properties */
bool
b_altfullscreen
;
/* which fullscreen method */
bool
b_altfullscreen
;
/* which fullscreen method */
#ifdef HAVE_SYS_SHM_H
#ifdef HAVE_SYS_SHM_H
int
i_shm_opcode
;
/* shared memory extension opcode */
int
i_shm_opcode
;
/* shared memory extension opcode */
#endif
#endif
#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
int
i_xvport
;
int
i_xvport
;
bool
b_paint_colourkey
;
bool
b_paint_colourkey
;
int
i_colourkey
;
int
i_colourkey
;
#else
#else
Colormap
colormap
;
/* colormap used (8bpp only) */
Colormap
colormap
;
/* colormap used (8bpp only) */
...
@@ -252,7 +252,7 @@ struct vout_sys_t
...
@@ -252,7 +252,7 @@ struct vout_sys_t
#endif
#endif
/* Mouse pointer properties */
/* Mouse pointer properties */
bool
b_mouse_pointer_visible
;
bool
b_mouse_pointer_visible
;
mtime_t
i_time_mouse_last_moved
;
/* used to auto-hide pointer*/
mtime_t
i_time_mouse_last_moved
;
/* used to auto-hide pointer*/
mtime_t
i_mouse_hide_timeout
;
/* after time hide cursor */
mtime_t
i_mouse_hide_timeout
;
/* after time hide cursor */
Cursor
blank_cursor
;
/* the hidden cursor */
Cursor
blank_cursor
;
/* the hidden cursor */
...
@@ -262,13 +262,13 @@ struct vout_sys_t
...
@@ -262,13 +262,13 @@ struct vout_sys_t
/* Window manager properties */
/* Window manager properties */
Atom
net_wm_state
;
Atom
net_wm_state
;
Atom
net_wm_state_fullscreen
;
Atom
net_wm_state_fullscreen
;
bool
b_net_wm_state_fullscreen
;
bool
b_net_wm_state_fullscreen
;
Atom
net_wm_state_above
;
Atom
net_wm_state_above
;
bool
b_net_wm_state_above
;
bool
b_net_wm_state_above
;
Atom
net_wm_state_stays_on_top
;
Atom
net_wm_state_stays_on_top
;
bool
b_net_wm_state_stays_on_top
;
bool
b_net_wm_state_stays_on_top
;
Atom
net_wm_state_below
;
Atom
net_wm_state_below
;
bool
b_net_wm_state_below
;
bool
b_net_wm_state_below
;
#ifdef MODULE_NAME_IS_glx
#ifdef MODULE_NAME_IS_glx
/* GLX properties */
/* GLX properties */
...
@@ -394,5 +394,3 @@ typedef struct mwmhints_t
...
@@ -394,5 +394,3 @@ typedef struct mwmhints_t
#else
#else
# define MAX_DIRECTBUFFERS 2
# define MAX_DIRECTBUFFERS 2
#endif
#endif
src/control/audio.c
View file @
56b3fdd4
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
#include <vlc_input.h>
#include <vlc_input.h>
#include <vlc_aout.h>
#include <vlc_aout.h>
/*
/*
* Remember to release the returned aout_instance_t since it is locked at
* Remember to release the returned aout_instance_t since it is locked at
* the end of this function.
* the end of this function.
...
@@ -120,7 +119,6 @@ VLC_PUBLIC_API void libvlc_audio_output_list_release( libvlc_audio_output_t *p_l
...
@@ -120,7 +119,6 @@ VLC_PUBLIC_API void libvlc_audio_output_list_release( libvlc_audio_output_t *p_l
}
}
}
}
/***********************
/***********************
* Set the audio output.
* Set the audio output.
***********************/
***********************/
...
@@ -166,7 +164,6 @@ int libvlc_audio_output_device_count( libvlc_instance_t *p_instance,
...
@@ -166,7 +164,6 @@ int libvlc_audio_output_device_count( libvlc_instance_t *p_instance,
else
else
free
(
psz_config_name
);
free
(
psz_config_name
);
return
0
;
return
0
;
}
}
...
@@ -364,7 +361,6 @@ int libvlc_audio_get_volume( libvlc_instance_t *p_instance,
...
@@ -364,7 +361,6 @@ int libvlc_audio_get_volume( libvlc_instance_t *p_instance,
return
(
i_volume
*
200
+
AOUT_VOLUME_MAX
/
2
)
/
AOUT_VOLUME_MAX
;
return
(
i_volume
*
200
+
AOUT_VOLUME_MAX
/
2
)
/
AOUT_VOLUME_MAX
;
}
}
/*****************************************************************************
/*****************************************************************************
* libvlc_audio_set_volume : Set the current volume
* libvlc_audio_set_volume : Set the current volume
*****************************************************************************/
*****************************************************************************/
...
...
src/control/video.c
View file @
56b3fdd4
/*****************************************************************************
/*****************************************************************************
* video.c: libvlc new API video functions
* video.c: libvlc new API video functions
*****************************************************************************
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* Copyright (C) 2005
-2009
the VideoLAN team
*
*
* $Id$
* $Id$
*
*
...
@@ -218,7 +218,7 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
...
@@ -218,7 +218,7 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
if
(
p_vout
)
if
(
p_vout
)
{
{
/* tell running vout to redraw area */
/* tell running vout to redraw area */
vout_Control
(
p_vout
,
VOUT_REDRAW_RECT
,
vout_Control
(
p_vout
,
VOUT_REDRAW_RECT
,
area
->
top
,
area
->
left
,
area
->
bottom
,
area
->
right
);
area
->
top
,
area
->
left
,
area
->
bottom
,
area
->
right
);
vlc_object_release
(
p_vout
);
vlc_object_release
(
p_vout
);
}
}
...
@@ -713,7 +713,5 @@ int libvlc_video_destroy( libvlc_media_player_t *p_mi,
...
@@ -713,7 +713,5 @@ int libvlc_video_destroy( libvlc_media_player_t *p_mi,
vout_thread_t
*
p_vout
=
GetVout
(
p_mi
,
p_e
);
vout_thread_t
*
p_vout
=
GetVout
(
p_mi
,
p_e
);
vlc_object_detach
(
p_vout
);
vlc_object_detach
(
p_vout
);
vlc_object_release
(
p_vout
);
vlc_object_release
(
p_vout
);
vlc_object_release
(
p_vout
);
return
0
;
return
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