diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2007-12-26 23:40:23 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2007-12-26 23:40:23 +0000 |
| commit | 4fe5e46cc3e710d8858aae5add2d9498d937c159 (patch) | |
| tree | 3fbf5f7e2fd426f91030d125007fe22949dfe4ce /channels/console_video.c | |
| parent | f24811e641a717cd1da33703c32c384c1886ff56 (diff) | |
more localizations around sdl_setup
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/console_video.c')
| -rw-r--r-- | channels/console_video.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/channels/console_video.c b/channels/console_video.c index e13078000..f73fcf3c4 100644 --- a/channels/console_video.c +++ b/channels/console_video.c @@ -1078,13 +1078,9 @@ static void *video_thread(void *arg) unsetenv("DISPLAY"); } } - if (SDL_Init(SDL_INIT_VIDEO)) { - ast_log(LOG_WARNING, "Could not initialize SDL - %s\n", - SDL_GetError()); - /* again not fatal, just we won't display anything */ - } else { - sdl_setup(env); - } + sdl_setup(env); + if (env->gui) + SDL_UpdateRects(env->gui->screen, 1, &env->gui->win[WIN_KEYPAD].rect);// XXX inefficient ast_mutex_init(&env->in.dec_in_lock); if (!ast_strlen_zero(save_display)) setenv("DISPLAY", save_display, 1); @@ -1130,8 +1126,6 @@ static void *video_thread(void *arg) /* sleep for a while */ ast_select(0, NULL, NULL, NULL, &t); - if (env->gui) - SDL_UpdateRects(env->gui->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. |