Mercurial > mplayer.hg
view gui/win32/wincfg.c @ 24129:50e1e79056b6
Make terminal input work more like VO key input
The Unix version of getch2() could either return an internally buffered
key or do a second-level select() in addition to the input.c one and
then read more data. Change getch2() to always add all read keys with
mplayer_put_key() (like video output window keyboard input does) and
remove the internal select() from the Unix version. Make input.c call
mplayer_get_key() directly.
The primary motivation for this change is to make combining multiple
event sources under one select() easier. Now getch2() only needs to be
called when the corresponding fd is readable, and it will be possible to
handle events from X-based VOs with the same code.
author | uau |
---|---|
date | Sat, 25 Aug 2007 04:28:08 +0000 |
parents | 21e29d5932c5 |
children | 363e217ce9fd |
line wrap: on
line source
/* * MPlayer GUI for Win32 * Copyright (C) 2003 Sascha Sommer <saschasommer@freenet.de> * Copyright (C) 2006 Erik Augustson <erik_27can@yahoo.com> * Copyright (C) 2006 Gianluigi Tiesi <sherpya@netfarm.it> * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with MPlayer; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <stdlib.h> #include <string.h> #include "mplayer.h" #include "mp_msg.h" #include "help_mp.h" #include "m_config.h" #include "m_option.h" #include "libvo/video_out.h" #include "mixer.h" #include "wincfg.h" #include "interface.h" /* params */ int gtkAONorm = 0; int gtkAOExtraStereo = 0; float gtkAOExtraStereoMul = 1.0; int gtkCacheOn = 0; int gtkCacheSize = 2048; int gtkAutoSyncOn = 0; int gtkAutoSync = 0; int sub_window = 0; int console = 0; int gui_save_pos = 1; int gui_main_pos_x = -2; int gui_main_pos_y = -2; int gui_sub_pos_x = -1; int gui_sub_pos_y = -1; /* External functions */ extern int frame_dropping; extern char *proc_priority; extern int m_config_parse_config_file(m_config_t *config, char *conffile); static m_config_t *gui_conf; static m_option_t gui_opts[] = { { "priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL }, { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, { "ao_volnorm", >kAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "ao_extra_stereo", >kAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "ao_extra_stereo_coefficient", >kAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10, 10, NULL }, { "delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -100.0, 100.0, NULL}, { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, { "cache", >kCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "cache_size", >kCacheSize, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL }, { "autosync", >kAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "autosync_size", >kAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL }, { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL }, { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, { "gui_sub_pos_x", &gui_sub_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, { "gui_sub_pos_y", &gui_sub_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, { "sub_window", &sub_window, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "console", &console, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } }; char *gfgets(char *str, int size, FILE *f) { char *s = fgets(str, size, f); char c; if(s) { c = s[strlen(s) - 1]; if ((c == '\n') || (c == '\r')) s[strlen(s) - 1]=0; c = s[strlen(s) - 1]; if ((c == '\n') || (c == '\r')) s[strlen(s) - 1]=0; } return s; } int cfg_read(void) { char *cfg = get_path("gui.conf"); /* read configuration */ mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] [cfg] reading config file: %s\n", cfg); gui_conf = m_config_new(); m_config_register_options(gui_conf, gui_opts); if (m_config_parse_config_file(gui_conf, cfg) < 0) mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_ConfigFileError); free(cfg); return 0; } int cfg_write(void) { char *cfg = get_path("gui.conf"); FILE *f; int i; /* save configuration */ if ((f = fopen(cfg, "wt+"))) { for (i=0; gui_opts[i].name; i++) { char *v = m_option_print(&gui_opts[i], gui_opts[i].p); if(v) { fprintf(f, "%s = \"%s\"\n", gui_opts[i].name, v); free(v); } else if((int) v == -1) mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_UnableToSaveOption, gui_opts[i].name); } fclose(f); } free(cfg); return 0; }