diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-26 21:10:42 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-26 21:10:42 +0000 |
| commit | 5972f781664111827d5c0490b845b95f4dddc83f (patch) | |
| tree | 45366599e0663847f58267ac06e790d24b667aa0 /channels/console_video.c | |
| parent | 2d1c26273830a8637923e0b2b217133814b5016a (diff) | |
move more gui stuff into console_gui.c
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@94810 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/console_video.c')
| -rw-r--r-- | channels/console_video.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/console_video.c b/channels/console_video.c index 9284da999..857cfc6e5 100644 --- a/channels/console_video.c +++ b/channels/console_video.c @@ -196,7 +196,6 @@ struct video_out_desc { struct fbuf_t enc_in; /* encoder input buffer, allocated in video_out_init() */ struct fbuf_t enc_out; /* encoder output buffer, allocated in video_out_init() */ struct fbuf_t loc_dpy; /* display source buffer, no buffer (managed by SDL in bmp[1]) */ - struct fbuf_t keypad_dpy; /* keypad source buffer, XXX */ struct video_codec_desc *enc; /* encoder */ void *enc_ctx; /* encoding context */ @@ -273,7 +272,6 @@ struct video_desc { char keypad_font[256]; /* font for the keypad */ char sdl_videodriver[256]; - struct display_window win[WIN_MAX]; }; static AVPicture *fill_pict(struct fbuf_t *b, AVPicture *p); @@ -1086,7 +1084,6 @@ static void *video_thread(void *arg) char save_display[128] = ""; env->screen = NULL; - bzero(env->win, sizeof(env->win)); /* if sdl_videodriver is set, override the environment. Also, * if it contains 'console' override DISPLAY around the call to SDL_Init @@ -1153,7 +1150,8 @@ static void *video_thread(void *arg) /* sleep for a while */ ast_select(0, NULL, NULL, NULL, &t); - SDL_UpdateRects(env->screen, 1, &env->win[WIN_KEYPAD].rect);// XXX inefficient + if (env->gui) + SDL_UpdateRects(env->screen, 1, &env->gui->win[WIN_KEYPAD].rect);// XXX inefficient /* * While there is something to display, call the decoder and free * the buffer, possibly enabling the receiver to store new data. |