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
982e367a
Commit
982e367a
authored
May 13, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caca: add Xlib initialization
(cherry picked from commit 760668e7a6accb3046207b7ae426e509cf73dc7f)
parent
6abd243f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
modules/video_output/Modules.am
modules/video_output/Modules.am
+3
-0
modules/video_output/caca.c
modules/video_output/caca.c
+13
-3
No files found.
modules/video_output/Modules.am
View file @
982e367a
...
...
@@ -135,6 +135,9 @@ libvlc_LTLIBRARIES += $(LTLIBegl)
libcaca_plugin_la_SOURCES = caca.c
libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
if !HAVE_WIN32
libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
endif
libcaca_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += libcaca_plugin.la
libvlc_LTLIBRARIES += $(LTLIBcaca)
...
...
modules/video_output/caca.c
View file @
982e367a
...
...
@@ -34,6 +34,12 @@
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
#ifndef WIN32
# ifdef X_DISPLAY_MISSING
# error Xlib required due to XInitThreads
# endif
# include <vlc_xlib.h>
#endif
#include <caca.h>
...
...
@@ -57,7 +63,7 @@ vlc_module_end()
*****************************************************************************/
static
picture_pool_t
*
Pool
(
vout_display_t
*
,
unsigned
);
static
void
Prepare
(
vout_display_t
*
,
picture_t
*
,
subpicture_t
*
);
static
void
Display
(
vout_display_t
*
,
picture_t
*
,
subpicture_t
*
);
static
void
Picture
Display
(
vout_display_t
*
,
picture_t
*
,
subpicture_t
*
);
static
int
Control
(
vout_display_t
*
,
int
,
va_list
);
/* */
...
...
@@ -82,6 +88,10 @@ static int Open(vlc_object_t *object)
vout_display_t
*
vd
=
(
vout_display_t
*
)
object
;
vout_display_sys_t
*
sys
;
#ifndef X_DISPLAY_MISSING
if
(
!
vlc_xlib_init
(
object
))
return
VLC_EGENERIC
;
#endif
#if defined(WIN32) && !defined(UNDER_CE)
CONSOLE_SCREEN_BUFFER_INFO
csbiInfo
;
SMALL_RECT
rect
;
...
...
@@ -180,7 +190,7 @@ static int Open(vlc_object_t *object)
vd
->
pool
=
Pool
;
vd
->
prepare
=
Prepare
;
vd
->
display
=
Display
;
vd
->
display
=
Picture
Display
;
vd
->
control
=
Control
;
vd
->
manage
=
Manage
;
...
...
@@ -284,7 +294,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
/**
* Display a picture
*/
static
void
Display
(
vout_display_t
*
vd
,
picture_t
*
picture
,
subpicture_t
*
subpicture
)
static
void
Picture
Display
(
vout_display_t
*
vd
,
picture_t
*
picture
,
subpicture_t
*
subpicture
)
{
Refresh
(
vd
);
picture_Release
(
picture
);
...
...
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