From 7262f6c9b4f3cd1bd8b98bcc40b74a05aa989ebc Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Feb 2010 15:34:56 +0000 Subject: Properly declare get_term_charset() instead of forward declaring it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30710 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/getch2.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'osdep') diff --git a/osdep/getch2.h b/osdep/getch2.h index f6f416b2a7..35e9801970 100644 --- a/osdep/getch2.h +++ b/osdep/getch2.h @@ -24,6 +24,8 @@ #ifndef MPLAYER_GETCH2_H #define MPLAYER_GETCH2_H +#include "config.h" + /* Screen size. Initialized by load_termcap() and get_screen_size() */ extern int screen_width; extern int screen_height; @@ -44,6 +46,17 @@ void getch2_disable(void); /* Read a character or a special key code (see keycodes.h) */ void getch2(void); +#ifdef CONFIG_ICONV +/** + * \brief gets the name of the system's terminal character set + * \return a malloced string indicating the system charset + * + * Be warned that this function on many systems is in no way thread-safe + * since it modifies global data + */ +char *get_term_charset(void); +#endif + /* slave cmd function for Windows and OS/2 */ int mp_input_slave_cmd_func(int fd,char* dest,int size); -- cgit v1.2.3 From 6676504bbe3ba356585bfc64ee1624ddbecb37ee Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Feb 2010 15:35:53 +0000 Subject: Conditionally declare mp_input_slave_cmd_func(). It does only get compiled on MinGW and OS/2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30711 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/getch2.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'osdep') diff --git a/osdep/getch2.h b/osdep/getch2.h index 35e9801970..5ee6108fc3 100644 --- a/osdep/getch2.h +++ b/osdep/getch2.h @@ -57,10 +57,9 @@ void getch2(void); char *get_term_charset(void); #endif +#if defined(__MINGW32__) || defined(__OS2__) /* slave cmd function for Windows and OS/2 */ int mp_input_slave_cmd_func(int fd,char* dest,int size); - -#if defined(__MINGW32__) || defined(__OS2__) #define USE_SELECT 0 #define MP_INPUT_SLAVE_CMD_FUNC mp_input_slave_cmd_func #else -- cgit v1.2.3 From 38648cae06d53dd4ddbed5fe3410398760e5c462 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Feb 2010 21:53:06 +0000 Subject: Mark sleep_accurate() as static, it is only used within the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30715 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/timer-darwin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'osdep') diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c index c292852c27..1833694015 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -35,7 +35,7 @@ const char *timer_name = "Darwin accurate"; /* the core sleep function, uses floats and is used in MPlayer G2 */ -float sleep_accurate(float time_frame) +static float sleep_accurate(float time_frame) { uint64_t deadline = time_frame / timebase_ratio + mach_absolute_time(); -- cgit v1.2.3 From 5405958e341f4de535d60b0f6eb13bcc6091f956 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 23 Feb 2010 07:54:10 +0000 Subject: Add header for macosx_finder_args() instead of forward declaring it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30717 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/macosx_finder_args.c | 1 + osdep/macosx_finder_args.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 osdep/macosx_finder_args.h (limited to 'osdep') diff --git a/osdep/macosx_finder_args.c b/osdep/macosx_finder_args.c index 81c1959894..cbd88ad4ac 100644 --- a/osdep/macosx_finder_args.c +++ b/osdep/macosx_finder_args.c @@ -23,6 +23,7 @@ #include "m_option.h" #include "m_config.h" #include "playtree.h" +#include "macosx_finder_args.h" static play_tree_t *files=NULL; diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h new file mode 100644 index 0000000000..fd047181a4 --- /dev/null +++ b/osdep/macosx_finder_args.h @@ -0,0 +1,26 @@ +/* + * 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. + */ + +#ifndef MPLAYER_MACOSX_FINDER_ARGS_H +#define MPLAYER_MACOSX_FINDER_ARGS_H + +#include "playtree.h" + +play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv); + +#endif /* MPLAYER_MACOSX_FINDER_ARGS_H */ -- cgit v1.2.3