Commit 51bbf793 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Merge branch 1.0-bugfix into master

parents 0f282618 83116c1c
/*****************************************************************************
* getcwd.c: POSIX getcwd() replacement
*****************************************************************************
* Copyright © 2009 the VideoLAN project
*
* This program 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.
*
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stddef.h>
char *getcwd (char *buf, size_t size)
{
#ifdef UNDER_CE
/* Windows CE lacks any notion of working directory, so we just
* return an error, and set errno - oh wait, WinCE doesn't support
* errno either! */
(void) buf; (void) size;
return NULL;
#else
# error Unimplemented!
#endif
}
......@@ -580,7 +580,7 @@ dnl Check for usual libc functions
AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r lrintf daemon fork lstat posix_fadvise posix_madvise uselocale])
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(fcntl)
AC_REPLACE_FUNCS([asprintf atof atoll gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
AC_CHECK_FUNCS([stricmp strnicmp])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
......
......@@ -44,7 +44,8 @@ typedef struct
#if !defined (HAVE_STRLCPY) || \
!defined (HAVE_STRNDUP) || \
!defined (HAVE_STRNLEN)
!defined (HAVE_STRNLEN) || \
!defined (HAVE_GETCWD)
# include <stddef.h> /* size_t */
#endif
......@@ -128,6 +129,10 @@ struct tm *localtime_r (const time_t *, struct tm *);
void rewind (FILE *);
#endif
#ifndef HAVE_GETCWD
char *getcwd (char *buf, size_t size);
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif
......
......@@ -1072,6 +1072,9 @@ void CaptureOpenPanel::initialize()
screenFPS->setAlignment( Qt::AlignRight );
screenPropLayout->addWidget( screenFPS, 0, 1 );
/* Screen connect */
CuMRL( screenFPS, valueChanged( int ) );
/* General connects */
CONNECT( ui.deviceCombo, activated( int ) ,
stackedDevLayout, setCurrentIndex( int ) );
......
......@@ -162,8 +162,6 @@ static int ConvertKeySym (xcb_keysym_t sym)
return KEY_SPACE;
if (isascii(sym))
return sym;
if (sym > XK_Delete)
return KEY_UNSET;
/* Special keys */
res = bsearch (&sym, tab, sizeof (tab) / sizeof (tab[0]), sizeof (tab[0]),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment