diff --git a/ChangeLog b/ChangeLog index 572af1f4a3..992e8af8f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-02-11 Sébastien Moutte + + * gst/realmedia/rmdemux.c:(gst_rmdemux_parse_indx_data): + Use gst_guint64_to_gdouble for conversions. + * gst/synaesthesia/synaescope.c: + Define M_PI and do not include and + for G_OS_WIN32 + * win32/vs6/libgstrealmedia.dsp: + * win32/vs6/synaesthesia.dsp: + Update projects files. + * win32/common/config.h.in: + Add config.h.in for autogen of config.h + 2007-02-11 Stefan Kost * configure.ac: diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index 5a91c09921..2b2446452b 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -1773,7 +1773,8 @@ gst_rmdemux_parse_indx_data (GstRMDemux * rmdemux, const guint8 * data, index[i].offset = RMDEMUX_GUINT32_GET (data + 6); GST_DEBUG_OBJECT (rmdemux, "Index found for timestamp=%f (at offset=%x)", - (float) index[i].timestamp / GST_SECOND, index[i].offset); + gst_guint64_to_gdouble (index[i].timestamp) / GST_SECOND, + index[i].offset); data += 14; } } diff --git a/gst/synaesthesia/synaescope.c b/gst/synaesthesia/synaescope.c index c25297e87b..083fff0ff0 100644 --- a/gst/synaesthesia/synaescope.c +++ b/gst/synaesthesia/synaescope.c @@ -25,10 +25,17 @@ #include "synaescope.h" +#ifndef G_OS_WIN32 #include +#include +#else +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif +#endif + #include #include -#include #include #include #include diff --git a/win32/common/config.h.in b/win32/common/config.h.in new file mode 100644 index 0000000000..e359ccec5e --- /dev/null +++ b/win32/common/config.h.in @@ -0,0 +1,239 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ +/* This copy of config.h.in is specifically for win32 Visual Studio builds */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* gettext package name */ +#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" + +/* macro to use to show function name */ +#define GST_FUNCTION "(function)" + +/* Defined if gcov is enabled to force a rebuild due to config.h changing */ +#undef GST_GCOV_ENABLED + +/* Default errorlevel to use */ +#undef GST_LEVEL_DEFAULT + +/* GStreamer license */ +#define GST_LICENSE "@GST_LICENSE@" + +/* package name in plugins */ +#define GST_PACKAGE_NAME "@GST_PACKAGE_NAME@" + +/* package origin */ +#define GST_PACKAGE_ORIGIN "@GST_PACKAGE_ORIGIN@" + +/* support for features: gstalsa */ +#undef HAVE_ALSA + +/* support for features: cdparanoia */ +#undef HAVE_CDPARANOIA + +/* Define if the host CPU is an Alpha */ +#undef HAVE_CPU_ALPHA + +/* Define if the host CPU is an ARM */ +#undef HAVE_CPU_ARM + +/* Define if the host CPU is a HPPA */ +#undef HAVE_CPU_HPPA + +/* Define if the host CPU is an x86 */ +#undef HAVE_CPU_I386 + +/* Define if the host CPU is a IA64 */ +#undef HAVE_CPU_IA64 + +/* Define if the host CPU is a M68K */ +#undef HAVE_CPU_M68K + +/* Define if the host CPU is a MIPS */ +#undef HAVE_CPU_MIPS + +/* Define if the host CPU is a PowerPC */ +#undef HAVE_CPU_PPC + +/* Define if the host CPU is a S390 */ +#undef HAVE_CPU_S390 + +/* Define if the host CPU is a SPARC */ +#undef HAVE_CPU_SPARC + +/* Define if the host CPU is a x86_64 */ +#undef HAVE_CPU_X86_64 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* support for features: */ +#undef HAVE_EXTERNAL + +/* FIONREAD ioctl found in sys/filio.h */ +#undef HAVE_FIONREAD_IN_SYS_FILIO + +/* FIONREAD ioctl found in sys/ioclt.h */ +#undef HAVE_FIONREAD_IN_SYS_IOCTL + +/* defined if the compiler implements __func__ */ +#undef HAVE_FUNC + +/* defined if the compiler implements __FUNCTION__ */ +#undef HAVE_FUNCTION + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* support for features: gnomevfssrc */ +#undef HAVE_GNOME_VFS + +/* support for features: v4lsrc v4lmjpegsrc v4lmjpegsink */ +#undef HAVE_GST_V4L + +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `asound' library (-lasound). */ +#undef HAVE_LIBASOUND + +/* support for features: libvisual */ +#undef HAVE_LIBVISUAL + +/* Define if you have C99's lrint function. */ +#undef HAVE_LRINT + +/* Define if you have C99's lrintf function. */ +#undef HAVE_LRINTF + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* support for features: oggdemux oggmux */ +#undef HAVE_OGG + +/* support for features: pango */ +#undef HAVE_PANGO + +/* defined if the compiler implements __PRETTY_FUNCTION__ */ +#undef HAVE_PRETTY_FUNCTION + +/* Define if RDTSC is available */ +#undef HAVE_RDTSC + +/* Define to 1 if you have the header file. */ +#undef HAVE_REGEX_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H 1 + +/* support for features: theoradec theoraenc */ +#undef HAVE_THEORA + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if valgrind should be used */ +#undef HAVE_VALGRIND + +/* support for features: vorbisenc vorbisdec */ +#undef HAVE_VORBIS + +/* defined if vorbis_synthesis_restart is present */ +#undef HAVE_VORBIS_SYNTHESIS_RESTART + +/* support for features: ximagesink */ +#undef HAVE_X + +/* support for features: xshm */ +#undef HAVE_XSHM + +/* support for features: xvimagesink */ +#undef HAVE_XVIDEO + +/* gettext locale dir */ +#define LOCALEDIR PREFIX "\\share\\locale" + +/* Name of package */ +#define PACKAGE "@PACKAGE@" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME "@PACKAGE_NAME@" + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING "@PACKAGE_STRING@" + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME "@PACKAGE_TARNAME@" + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION "@PACKAGE_VERSION@" + +/* directory where plugins are located */ +#undef PLUGINDIR + +/* The size of a `char', as computed by sizeof. */ +#undef SIZEOF_CHAR + +/* The size of a `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of a `short', as computed by sizeof. */ +#undef SIZEOF_SHORT + +/* The size of a `void*', as computed by sizeof. */ +#undef SIZEOF_VOIDP + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#define VERSION "@VERSION@" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif diff --git a/win32/vs6/libgstrealmedia.dsp b/win32/vs6/libgstrealmedia.dsp index 16131c703d..8ddd6029e5 100644 --- a/win32/vs6/libgstrealmedia.dsp +++ b/win32/vs6/libgstrealmedia.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 ibgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" # Begin Special Build Tool TargetPath=.\Release\libgstrealmedia.dll SOURCE="$(InputPath)" @@ -104,8 +104,20 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\gst\realmedia\rademux.c +# End Source File +# Begin Source File + +SOURCE=..\..\gst\realmedia\rdtdepay.c +# End Source File +# Begin Source File + SOURCE=..\..\gst\realmedia\rmdemux.c # End Source File +# Begin Source File + +SOURCE=..\..\gst\realmedia\rmutils.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/vs6/libgstsynaesthesia.dsp b/win32/vs6/libgstsynaesthesia.dsp index 58cb4add8a..a54e797155 100644 --- a/win32/vs6/libgstsynaesthesia.dsp +++ b/win32/vs6/libgstsynaesthesia.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSYNAESTHESIA_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "./" /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSYNAESTHESIA_EXPORTS" /D "HAVE_CONFIG_H" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "./" /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../../gstreamer/win32/common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSYNAESTHESIA_EXPORTS" /D "HAVE_CONFIG_H" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -75,7 +75,7 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10 # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSYNAESTHESIA_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSYNAESTHESIA_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../../gstreamer/win32/common" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTSYNAESTHESIA_EXPORTS" /D "HAVE_CONFIG_H" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32