Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
0ce02427
Commit
0ce02427
authored
May 30, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "CACA: use key thread (partially fix #3661)"
This reverts commit
031dec33
.
parent
8f61520c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
modules/video_output/Modules.am
modules/video_output/Modules.am
+1
-1
modules/video_output/caca.c
modules/video_output/caca.c
+1
-5
No files found.
modules/video_output/Modules.am
View file @
0ce02427
...
@@ -5,7 +5,7 @@ SUBDIRS = msw
...
@@ -5,7 +5,7 @@ SUBDIRS = msw
LIBTOOL=@LIBTOOL@ --tag=CC
LIBTOOL=@LIBTOOL@ --tag=CC
SOURCES_aa = aa.c
SOURCES_aa = aa.c
SOURCES_caca = caca.c
keythread.h keythread.c
SOURCES_caca = caca.c
SOURCES_fb = fb.c
SOURCES_fb = fb.c
SOURCES_vout_sdl = sdl.c keythread.h keythread.c
SOURCES_vout_sdl = sdl.c keythread.h keythread.c
SOURCES_snapshot = snapshot.c
SOURCES_snapshot = snapshot.c
...
...
modules/video_output/caca.c
View file @
0ce02427
...
@@ -34,7 +34,6 @@
...
@@ -34,7 +34,6 @@
#include <vlc_plugin.h>
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
#include <vlc_picture_pool.h>
#include "keythread.h"
#include <caca.h>
#include <caca.h>
...
@@ -73,7 +72,6 @@ struct vout_display_sys_t {
...
@@ -73,7 +72,6 @@ struct vout_display_sys_t {
cucul_dither_t
*
dither
;
cucul_dither_t
*
dither
;
picture_pool_t
*
pool
;
picture_pool_t
*
pool
;
key_thread_t
*
keys
;
};
};
/**
/**
...
@@ -190,7 +188,6 @@ static int Open(vlc_object_t *object)
...
@@ -190,7 +188,6 @@ static int Open(vlc_object_t *object)
vout_display_SendEventFullscreen
(
vd
,
false
);
vout_display_SendEventFullscreen
(
vd
,
false
);
Refresh
(
vd
);
Refresh
(
vd
);
sys
->
keys
=
vlc_CreateKeyThread
(
vd
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
...
@@ -220,7 +217,6 @@ static void Close(vlc_object_t *object)
...
@@ -220,7 +217,6 @@ static void Close(vlc_object_t *object)
vout_display_t
*
vd
=
(
vout_display_t
*
)
object
;
vout_display_t
*
vd
=
(
vout_display_t
*
)
object
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
vlc_DestroyKeyThread
(
sys
->
keys
);
if
(
sys
->
pool
)
if
(
sys
->
pool
)
picture_pool_Delete
(
sys
->
pool
);
picture_pool_Delete
(
sys
->
pool
);
if
(
sys
->
dither
)
if
(
sys
->
dither
)
...
@@ -481,7 +477,7 @@ static void Manage(vout_display_t *vd)
...
@@ -481,7 +477,7 @@ static void Manage(vout_display_t *vd)
const
int
vlc
=
keys
[
i
].
vlc
;
const
int
vlc
=
keys
[
i
].
vlc
;
if
(
vlc
>=
0
)
if
(
vlc
>=
0
)
v
lc_EmitKey
(
sys
->
keys
,
vlc
);
v
out_display_SendEventKey
(
vd
,
vlc
);
return
;
return
;
}
}
}
}
...
...
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