kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

more localization of gui stuff

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2007-12-27 17:26:16 +00:00
parent 9d89dc11ae
commit b634b8ccca
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
channels/console_gui.c
View File

@@ -744,7 +744,6 @@ static void sdl_setup(struct video_desc *env)
int depth, maxw, maxh; int depth, maxw, maxh;
const SDL_VideoInfo *info; const SDL_VideoInfo *info;
int kp_w = 0, kp_h = 0; /* keypad width and height */ int kp_w = 0, kp_h = 0; /* keypad width and height */
int sdl_ok = 0;
struct gui_info *gui = env->gui; struct gui_info *gui = env->gui;
/* /*
@@ -775,9 +774,6 @@ static void sdl_setup(struct video_desc *env)
env->gui = gui = gui_init(); env->gui = gui = gui_init();
if (!gui) if (!gui)
goto no_sdl; goto no_sdl;
/* initialize grab coordinates */
env->out.loc_src.x = 0;
env->out.loc_src.y = 0;
keypad_setup(gui, env->keypad_file); keypad_setup(gui, env->keypad_file);
#if 0 #if 0
@@ -811,7 +807,7 @@ static void sdl_setup(struct video_desc *env)
/* display the skin, but do not free it as we need it later to /* display the skin, but do not free it as we need it later to
* restore text areas and maybe sliders too. * restore text areas and maybe sliders too.
*/ */
if (gui && gui->keypad) { if (gui->keypad) {
struct SDL_Rect *dest = &gui->win[WIN_KEYPAD].rect; struct SDL_Rect *dest = &gui->win[WIN_KEYPAD].rect;
dest->x = 2*BORDER + env->in.rem_dpy.w; dest->x = 2*BORDER + env->in.rem_dpy.w;
dest->y = BORDER; dest->y = BORDER;
@@ -820,13 +816,11 @@ static void sdl_setup(struct video_desc *env)
SDL_BlitSurface(gui->keypad, NULL, gui->screen, dest); SDL_BlitSurface(gui->keypad, NULL, gui->screen, dest);
SDL_UpdateRects(gui->screen, 1, dest); SDL_UpdateRects(gui->screen, 1, dest);
} }
env->in.dec_in_cur = &env->in.dec_in[0]; return;
env->in.dec_in_dpy = NULL; /* nothing to display */
sdl_ok = 1;
no_sdl: no_sdl:
if (!sdl_ok) /* free resources in case of errors */ /* free resources in case of errors */
env->gui = cleanup_sdl(gui); env->gui = cleanup_sdl(gui);
} }
/* /*

10
channels/console_video.c
View File

@@ -1079,10 +1079,18 @@ static void *video_thread(void *arg)
} }
} }
sdl_setup(env); sdl_setup(env);
ast_mutex_init(&env->in.dec_in_lock);
if (!ast_strlen_zero(save_display)) if (!ast_strlen_zero(save_display))
setenv("DISPLAY", save_display, 1); setenv("DISPLAY", save_display, 1);
/* initialize grab coordinates */
env->out.loc_src.x = 0;
env->out.loc_src.y = 0;
/* reset the pointers to the current decoded image */
env->in.dec_in_cur = &env->in.dec_in[0];
env->in.dec_in_dpy = NULL; /* nothing to display */
ast_mutex_init(&env->in.dec_in_lock); /* used to sync decoder and renderer */
if (video_open(&env->out)) { if (video_open(&env->out)) {
ast_log(LOG_WARNING, "cannot open local video source\n"); ast_log(LOG_WARNING, "cannot open local video source\n");
} else { } else {