Menu
▾
▴
modplug-svn-commit
|
From: <sag...@us...> - 2015-04-11 23:36:44
|
Revision: 4926
http://sourceforge.net/p/modplug/code/4926
Author: saga-games
Date: 2015-04-11 23:36:29 +0000 (Sat, 11 Apr 2015)
Log Message:
-----------
Google Code will be dead soon, update links for external projects where available
Modified Paths:
--------------
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/installer/packageTemplate/readme.txt
trunk/OpenMPT/packageTemplate/readme.txt
Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp 2015-04-11 14:22:54 UTC (rev 4925)
+++ trunk/OpenMPT/common/version.cpp 2015-04-11 23:36:29 UTC (rev 4926)
@@ -423,7 +423,7 @@
"Stephan M. Bernsee for pitch shifting source code\n"
"http://www.dspdimension.com/\n"
"Aleksey Vaneev of Voxengo for r8brain sample rate converter\n"
- "https://code.google.com/p/r8brain-free-src/\n"
+ "https://github.com/avaneev/r8brain-free-src\n"
"Olli Parviainen for SoundTouch Library (time stretching)\n"
"http://www.surina.net/soundtouch/\n"
#endif
@@ -438,7 +438,7 @@
"Ben \"GreaseMonkey\" Russell for IT sample compression code\n"
"https://github.com/iamgreaser/it2everything/\n"
"Alexander Chemeris for msinttypes\n"
- "https://code.google.com/p/msinttypes/\n"
+ "https://github.com/chemeris/msinttypes\n"
#ifndef NO_ZLIB
"Jean-loup Gailly and Mark Adler for zlib\n"
"http://zlib.net/\n"
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2015-04-11 14:22:54 UTC (rev 4925)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2015-04-11 23:36:29 UTC (rev 4926)
@@ -104,7 +104,7 @@
OpenMPT uses r8brain-free for sample rate conversion in the sample editor, which
is released under the MIT license.
Sample rate converter designed by Aleksey Vaneev of Voxengo
-Visit https://code.google.com/p/r8brain-free-src/ for more information.
+Visit https://github.com/avaneev/r8brain-free-src for more information.
unmo3.dll
---------
Modified: trunk/OpenMPT/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/readme.txt 2015-04-11 14:22:54 UTC (rev 4925)
+++ trunk/OpenMPT/packageTemplate/readme.txt 2015-04-11 23:36:29 UTC (rev 4926)
@@ -120,7 +120,7 @@
OpenMPT uses r8brain-free for sample rate conversion in the sample editor, which
is released under the MIT license.
Sample rate converter designed by Aleksey Vaneev of Voxengo
-Visit https://code.google.com/p/r8brain-free-src/ for more information.
+Visit https://github.com/avaneev/r8brain-free-src for more information.
unmo3.dll
---------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-16 12:33:57
|
Revision: 4932
http://sourceforge.net/p/modplug/code/4932
Author: manxorist
Date: 2015-04-16 12:33:50 +0000 (Thu, 16 Apr 2015)
Log Message:
-----------
[Fix] libopenmpt: Support GCC 4.3. GCC 4.3 had not been tested previously and failed to compile in both c++0x and c++98 modes. In c++98 mode, it does not support <cstdint> and in c++0x mode, it does not support unique_ptr and various other minor STL features. Make it work in c++0x mode with a tiny bit of support macros. Supporting c++98 mode is not feasable because we typedef our own std::int types in namespace std:: in the public header file which would conflict with clients compiling in c++0x mode.
Modified Paths:
--------------
trunk/OpenMPT/Makefile
trunk/OpenMPT/README.md
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/libopenmpt/dox/changelog.md
trunk/OpenMPT/libopenmpt/dox/dependencies.md
trunk/OpenMPT/libopenmpt/dox/quickstart.md
trunk/OpenMPT/libopenmpt/libopenmpt_config.h
trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp
trunk/OpenMPT/openmpt123/openmpt123.cpp
trunk/OpenMPT/openmpt123/openmpt123_config.hpp
trunk/OpenMPT/soundlib/Load_psm.cpp
Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/Makefile 2015-04-16 12:33:50 UTC (rev 4932)
@@ -47,7 +47,7 @@
# OPTIMIZE_SIZE=0 Build size-optimized binaries
# TEST=1 Include test suite in default target.
# ONLY_TEST=0 Only build the test suite.
-# ANCIENT=0 Use a pre-C++0x compiler (i.e. GCC before 4.3)
+# ANCIENT=0 Use a pre-C++0x compiler (i.e. GCC before 4.3.0)
# STRICT=0 Treat warnings as errors.
# CHECKED=0 Enable run-time assertions.
# CHECKED_ADDRESS=0 Enable address sanitizer
Modified: trunk/OpenMPT/README.md
===================================================================
--- trunk/OpenMPT/README.md 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/README.md 2015-04-16 12:33:50 UTC (rev 4932)
@@ -108,7 +108,7 @@
- mingw-w64:
- The required version should be at least 4.4. Only 4.6 and up are
+ The required version should be at least 4.3. Only 4.6 and up are
tested.
make CONFIG=mingw64-win32 # for win32
@@ -119,7 +119,7 @@
The minimum required compiler versions are:
- - gcc 4.4
+ - gcc 4.3
- clang 3.0
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/common/typedefs.h 2015-04-16 12:33:50 UTC (rev 4932)
@@ -299,8 +299,9 @@
OPENMPT_NAMESPACE_END
#include <cstdarg>
+#include <stdarg.h>
OPENMPT_NAMESPACE_BEGIN
-#if MPT_COMPILER_MSVC
+#if MPT_COMPILER_MSVC || (MPT_COMPILER_GCC && MPT_GCC_AT_LEAST(4,3,0) && MPT_GCC_BEFORE(4,4,0))
#ifndef va_copy
#define va_copy(dst, src) do { (dst) = (src); } while (0)
#endif
Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-16 12:33:50 UTC (rev 4932)
@@ -19,6 +19,8 @@
preferred backend because SDL is more widespread and better tested on all
kinds of different platforms, and in generel, SDL is just more reliable.
+ * libopenmpt now also supports GCC 4.3.
+
* libopenmpt now supports PLM (Disorder Tracker 2) files.
* Various playback improvements and fixes for IT, S3M, XM, MOD, PTM and 669
Modified: trunk/OpenMPT/libopenmpt/dox/dependencies.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/dependencies.md 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/libopenmpt/dox/dependencies.md 2015-04-16 12:33:50 UTC (rev 4932)
@@ -10,7 +10,7 @@
* Supported compilers for building libopenmpt:
* **Microsoft Visual Studio 2010** or higher (2008 is partially supported)
- * **GCC 4.4** or higher (4.1 to 4.3 are partially supported)
+ * **GCC 4.3** or higher (4.1 to 4.2 are partially supported)
* **Clang 3.0** or higher
* **MinGW-W64 4.6** or higher
* **emscripten 1.21** or higher
@@ -35,7 +35,7 @@
* Supported compilers for building openmpt:
* **Microsoft Visual Studio 2010** or higher (2008 is partially supported)
- * **GCC 4.4** or higher (4.1 to 4.3 are partially supported)
+ * **GCC 4.3** or higher (4.1 to 4.2 are partially supported)
* **Clang 3.0** or higher
* **MinGW-W64 4.6** or higher
* any **C++11 compliant** compiler should also work
Modified: trunk/OpenMPT/libopenmpt/dox/quickstart.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/quickstart.md 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/libopenmpt/dox/quickstart.md 2015-04-16 12:33:50 UTC (rev 4932)
@@ -7,7 +7,7 @@
1. Grab a `libopenmpt-autotools.VERSION.tar.gz` tarball.
2. Get dependencies:
- - **gcc >= 4.4** or **clang >= 3.0**
+ - **gcc >= 4.3** or **clang >= 3.0**
- **pkg-config >= 0.24**
- **zlib**
- **doxygen >= 1.8**
@@ -40,7 +40,7 @@
1. Get dependencies:
- **GNU make**
- - **gcc >= 4.4** or **clang >= 3.0**
+ - **gcc >= 4.3** or **clang >= 3.0**
- **pkg-config**
2. *Optional*:
- **zlib**
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_config.h
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_config.h 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_config.h 2015-04-16 12:33:50 UTC (rev 4932)
@@ -98,12 +98,19 @@
#if defined(_MSC_VER)
#if (_MSC_VER >= 1500) && (_MSC_VER < 1600)
#define LIBOPENMPT_ANCIENT_COMPILER
+#define LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+#define LIBOPENMPT_SHARE_PTR std::tr1::shared_ptr
#endif
#endif
#if defined(__GNUC__) && !defined(__clang__)
#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__*1 < 40300)
#define LIBOPENMPT_ANCIENT_COMPILER
+#define LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+#define LIBOPENMPT_SHARED_PTR std::tr1::shared_ptr
+#elif (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__*1 < 40400)
+#define LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+#define LIBOPENMPT_SHARED_PTR std::shared_ptr
#endif
#endif
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2015-04-16 12:33:50 UTC (rev 4932)
@@ -174,14 +174,14 @@
class log_forwarder : public ILog {
private:
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<log_interface> destination;
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<log_interface> destination;
#else
std::shared_ptr<log_interface> destination;
#endif
public:
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- log_forwarder( std::tr1::shared_ptr<log_interface> dest ) : destination(dest) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ log_forwarder( LIBOPENMPT_SHARED_PTR<log_interface> dest ) : destination(dest) {
#else
log_forwarder( std::shared_ptr<log_interface> dest ) : destination(dest) {
#endif
@@ -333,19 +333,19 @@
return !m_subsongs.empty();
}
void module_impl::ctor( const std::map< std::string, std::string > & ctls ) {
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- m_sndFile = std::tr1::shared_ptr<CSoundFile>(new CSoundFile());
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ m_sndFile = LIBOPENMPT_SHARED_PTR<CSoundFile>(new CSoundFile());
#else
m_sndFile = std::unique_ptr<CSoundFile>(new CSoundFile());
#endif
m_loaded = false;
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- m_Dither = std::tr1::shared_ptr<Dither>(new Dither());
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ m_Dither = LIBOPENMPT_SHARED_PTR<Dither>(new Dither());
#else
m_Dither = std::unique_ptr<Dither>(new Dither());
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- m_LogForwarder = std::tr1::shared_ptr<log_forwarder>(new log_forwarder(m_Log));
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ m_LogForwarder = LIBOPENMPT_SHARED_PTR<log_forwarder>(new log_forwarder(m_Log));
#else
m_LogForwarder = std::unique_ptr<log_forwarder>(new log_forwarder(m_Log));
#endif
@@ -478,18 +478,18 @@
std::transform( lowercase_ext.begin(), lowercase_ext.end(), lowercase_ext.begin(), tolower );
return std::find( extensions.begin(), extensions.end(), lowercase_ext ) != extensions.end();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-double module_impl::could_open_propability( const OpenMPT::FileReader & file, double effort, std::tr1::shared_ptr<log_interface> log ) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+double module_impl::could_open_propability( const OpenMPT::FileReader & file, double effort, LIBOPENMPT_SHARED_PTR<log_interface> log ) {
#else
double module_impl::could_open_propability( const OpenMPT::FileReader & file, double effort, std::shared_ptr<log_interface> log ) {
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<CSoundFile> sndFile( new CSoundFile() );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<CSoundFile> sndFile( new CSoundFile() );
#else
std::unique_ptr<CSoundFile> sndFile( new CSoundFile() );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<log_forwarder> logForwarder( new log_forwarder( log ) );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<log_forwarder> logForwarder( new log_forwarder( log ) );
#else
std::unique_ptr<log_forwarder> logForwarder( new log_forwarder( log ) );
#endif
@@ -524,8 +524,8 @@
}
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-double module_impl::could_open_propability( callback_stream_wrapper stream, double effort, std::tr1::shared_ptr<log_interface> log ) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+double module_impl::could_open_propability( callback_stream_wrapper stream, double effort, LIBOPENMPT_SHARED_PTR<log_interface> log ) {
#else
double module_impl::could_open_propability( callback_stream_wrapper stream, double effort, std::shared_ptr<log_interface> log ) {
#endif
@@ -536,16 +536,16 @@
fstream.tell = stream.tell;
return could_open_propability( FileReader( fstream ), effort, log );
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-double module_impl::could_open_propability( std::istream & stream, double effort, std::tr1::shared_ptr<log_interface> log ) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+double module_impl::could_open_propability( std::istream & stream, double effort, LIBOPENMPT_SHARED_PTR<log_interface> log ) {
#else
double module_impl::could_open_propability( std::istream & stream, double effort, std::shared_ptr<log_interface> log ) {
#endif
return could_open_propability( FileReader( &stream ), effort, log );
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( callback_stream_wrapper stream, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( callback_stream_wrapper stream, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( callback_stream_wrapper stream, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -558,8 +558,8 @@
load( FileReader( fstream ), ctls );
apply_libopenmpt_defaults();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( std::istream & stream, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( std::istream & stream, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( std::istream & stream, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -567,8 +567,8 @@
load( FileReader( &stream ), ctls );
apply_libopenmpt_defaults();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( const std::vector<std::uint8_t> & data, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( const std::vector<std::uint8_t> & data, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( const std::vector<std::uint8_t> & data, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -580,8 +580,8 @@
#endif
apply_libopenmpt_defaults();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( const std::vector<char> & data, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( const std::vector<char> & data, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( const std::vector<char> & data, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -593,8 +593,8 @@
#endif
apply_libopenmpt_defaults();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( const std::uint8_t * data, std::size_t size, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( const std::uint8_t * data, std::size_t size, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( const std::uint8_t * data, std::size_t size, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -602,8 +602,8 @@
load( FileReader( data, size ), ctls );
apply_libopenmpt_defaults();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( const char * data, std::size_t size, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( const char * data, std::size_t size, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( const char * data, std::size_t size, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -611,8 +611,8 @@
load( FileReader( data, size ), ctls );
apply_libopenmpt_defaults();
}
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
-module_impl::module_impl( const void * data, std::size_t size, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+module_impl::module_impl( const void * data, std::size_t size, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#else
module_impl::module_impl( const void * data, std::size_t size, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls ) : m_Log(log) {
#endif
@@ -768,8 +768,8 @@
double module_impl::get_duration_seconds() const {
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::tr1::shared_ptr<subsongs_type>() : std::tr1::shared_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<subsongs_type> subsongs_temp = has_subsongs_inited() ? LIBOPENMPT_SHARED_PTR<subsongs_type>() : LIBOPENMPT_SHARED_PTR<subsongs_type>( new subsongs_type( get_subsongs() ) );
#else
std::unique_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::unique_ptr<subsongs_type>() : std::unique_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
#endif
@@ -785,8 +785,8 @@
return subsongs[m_current_subsong].duration;
}
void module_impl::select_subsong( std::int32_t subsong ) {
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::tr1::shared_ptr<subsongs_type>() : std::tr1::shared_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<subsongs_type> subsongs_temp = has_subsongs_inited() ? LIBOPENMPT_SHARED_PTR<subsongs_type>() : LIBOPENMPT_SHARED_PTR<subsongs_type>( new subsongs_type( get_subsongs() ) );
#else
std::unique_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::unique_ptr<subsongs_type>() : std::unique_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
#endif
@@ -813,8 +813,8 @@
return m_currentPositionSeconds;
}
double module_impl::set_position_seconds( double seconds ) {
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::tr1::shared_ptr<subsongs_type>() : std::tr1::shared_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<subsongs_type> subsongs_temp = has_subsongs_inited() ? LIBOPENMPT_SHARED_PTR<subsongs_type>() : LIBOPENMPT_SHARED_PTR<subsongs_type>( new subsongs_type( get_subsongs() ) );
#else
std::unique_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::unique_ptr<subsongs_type>() : std::unique_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
#endif
@@ -1003,8 +1003,8 @@
}
std::int32_t module_impl::get_num_subsongs() const {
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::tr1::shared_ptr<subsongs_type>() : std::tr1::shared_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<subsongs_type> subsongs_temp = has_subsongs_inited() ? LIBOPENMPT_SHARED_PTR<subsongs_type>() : LIBOPENMPT_SHARED_PTR<subsongs_type>( new subsongs_type( get_subsongs() ) );
#else
std::unique_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::unique_ptr<subsongs_type>() : std::unique_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
#endif
@@ -1029,8 +1029,8 @@
std::vector<std::string> module_impl::get_subsong_names() const {
std::vector<std::string> retval;
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::tr1::shared_ptr<subsongs_type>() : std::tr1::shared_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<subsongs_type> subsongs_temp = has_subsongs_inited() ? LIBOPENMPT_SHARED_PTR<subsongs_type>() : LIBOPENMPT_SHARED_PTR<subsongs_type>( new subsongs_type( get_subsongs() ) );
#else
std::unique_ptr<subsongs_type> subsongs_temp = has_subsongs_inited() ? std::unique_ptr<subsongs_type>() : std::unique_ptr<subsongs_type>( new subsongs_type( get_subsongs() ) );
#endif
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp 2015-04-16 12:33:50 UTC (rev 4932)
@@ -75,26 +75,26 @@
}; // struct subsong_data
typedef std::vector<subsong_data> subsongs_type;
static const std::int32_t all_subsongs = -1;
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<log_interface> m_Log;
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<log_interface> m_Log;
#else
std::shared_ptr<log_interface> m_Log;
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<log_forwarder> m_LogForwarder;
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<log_forwarder> m_LogForwarder;
#else
std::unique_ptr<log_forwarder> m_LogForwarder;
#endif
std::int32_t m_current_subsong;
double m_currentPositionSeconds;
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<OpenMPT::CSoundFile> m_sndFile;
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<OpenMPT::CSoundFile> m_sndFile;
#else
std::unique_ptr<OpenMPT::CSoundFile> m_sndFile;
#endif
bool m_loaded;
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- std::tr1::shared_ptr<OpenMPT::Dither> m_Dither;
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ LIBOPENMPT_SHARED_PTR<OpenMPT::Dither> m_Dither;
#else
std::unique_ptr<OpenMPT::Dither> m_Dither;
#endif
@@ -124,56 +124,56 @@
std::size_t read_interleaved_wrapper( std::size_t count, std::size_t channels, float * interleaved );
std::pair< std::string, std::string > format_and_highlight_pattern_row_channel_command( std::int32_t p, std::int32_t r, std::int32_t c, int command ) const;
std::pair< std::string, std::string > format_and_highlight_pattern_row_channel( std::int32_t p, std::int32_t r, std::int32_t c, std::size_t width, bool pad ) const;
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- static double could_open_propability( const OpenMPT::FileReader & file, double effort, std::tr1::shared_ptr<log_interface> log );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ static double could_open_propability( const OpenMPT::FileReader & file, double effort, LIBOPENMPT_SHARED_PTR<log_interface> log );
#else
static double could_open_propability( const OpenMPT::FileReader & file, double effort, std::shared_ptr<log_interface> log );
#endif
public:
static std::vector<std::string> get_supported_extensions();
static bool is_extension_supported( const std::string & extension );
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- static double could_open_propability( callback_stream_wrapper stream, double effort, std::tr1::shared_ptr<log_interface> log );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ static double could_open_propability( callback_stream_wrapper stream, double effort, LIBOPENMPT_SHARED_PTR<log_interface> log );
#else
static double could_open_propability( callback_stream_wrapper stream, double effort, std::shared_ptr<log_interface> log );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- static double could_open_propability( std::istream & stream, double effort, std::tr1::shared_ptr<log_interface> log );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ static double could_open_propability( std::istream & stream, double effort, LIBOPENMPT_SHARED_PTR<log_interface> log );
#else
static double could_open_propability( std::istream & stream, double effort, std::shared_ptr<log_interface> log );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( callback_stream_wrapper stream, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( callback_stream_wrapper stream, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( callback_stream_wrapper stream, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( std::istream & stream, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( std::istream & stream, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( std::istream & stream, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( const std::vector<std::uint8_t> & data, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( const std::vector<std::uint8_t> & data, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( const std::vector<std::uint8_t> & data, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( const std::vector<char> & data, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( const std::vector<char> & data, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( const std::vector<char> & data, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( const std::uint8_t * data, std::size_t size, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( const std::uint8_t * data, std::size_t size, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( const std::uint8_t * data, std::size_t size, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( const char * data, std::size_t size, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( const char * data, std::size_t size, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( const char * data, std::size_t size, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
-#ifdef LIBOPENMPT_ANCIENT_COMPILER
- module_impl( const void * data, std::size_t size, std::tr1::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
+#ifdef LIBOPENMPT_ANCIENT_COMPILER_SHARED_PTR
+ module_impl( const void * data, std::size_t size, LIBOPENMPT_SHARED_PTR<log_interface> log, const std::map< std::string, std::string > & ctls );
#else
module_impl( const void * data, std::size_t size, std::shared_ptr<log_interface> log, const std::map< std::string, std::string > & ctls );
#endif
Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.cpp 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/openmpt123/openmpt123.cpp 2015-04-16 12:33:50 UTC (rev 4932)
@@ -171,7 +171,7 @@
: impl(0)
{
if ( !flags.force_overwrite ) {
-#if defined(OPENMPT123_ANCIENT_COMPILER)
+#if defined(OPENMPT123_ANCIENT_COMPILER_FSTREAM)
std::ifstream testfile( filename.c_str(), std::ios::binary );
#else
std::ifstream testfile( filename, std::ios::binary );
@@ -1441,7 +1441,7 @@
file_stream.str( data );
filesize = data.length();
#elif defined(_MSC_VER) && defined(UNICODE)
-#if defined(OPENMPT123_ANCIENT_COMPILER)
+#if defined(OPENMPT123_ANCIENT_COMPILER_FSTREAM)
file_stream.open( utf8_to_wstring( filename ).c_str(), std::ios::binary );
#else
file_stream.open( utf8_to_wstring( filename ), std::ios::binary );
@@ -1450,7 +1450,7 @@
filesize = file_stream.tellg();
file_stream.seekg( 0, std::ios::beg );
#else
-#if defined(OPENMPT123_ANCIENT_COMPILER)
+#if defined(OPENMPT123_ANCIENT_COMPILER_FSTREAM)
file_stream.open( filename.c_str(), std::ios::binary );
#else
file_stream.open( filename, std::ios::binary );
Modified: trunk/OpenMPT/openmpt123/openmpt123_config.hpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123_config.hpp 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/openmpt123/openmpt123_config.hpp 2015-04-16 12:33:50 UTC (rev 4932)
@@ -66,6 +66,7 @@
#if defined(_MSC_VER)
#if (_MSC_VER >= 1500) && (_MSC_VER < 1600)
#define OPENMPT123_ANCIENT_COMPILER
+#define OPENMPT123_ANCIENT_COMPILER_FSTREAM
#endif
#endif
@@ -73,7 +74,10 @@
#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__*1 < 40300)
#define OPENMPT123_ANCIENT_COMPILER
#endif
+#if (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__*1 < 40400)
+#define OPENMPT123_ANCIENT_COMPILER_FSTREAM
#endif
+#endif
#ifdef OPENMPT123_ANCIENT_COMPILER
#include <stdint.h>
Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp 2015-04-13 13:27:38 UTC (rev 4931)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp 2015-04-16 12:33:50 UTC (rev 4932)
@@ -526,7 +526,7 @@
chunkCount++;
}
// separate subsongs by "---" patterns
- orderOffsets.push_back(nullptr);
+ orderOffsets.push_back(static_cast<FileReader*>(nullptr)); // GCC 4.3 does not like .push_back(nullptr) here
Order.Append();
}
case PSMChunk::idPPAN: // PPAN - Channel panning table (used in Sinaria)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-16 18:59:37
|
Revision: 4934
http://sourceforge.net/p/modplug/code/4934
Author: manxorist
Date: 2015-04-16 18:59:30 +0000 (Thu, 16 Apr 2015)
Log Message:
-----------
[Doc] libopenmpt: Document GCC 4.1 and 4.2 support in README.md.
Modified Paths:
--------------
trunk/OpenMPT/README.md
trunk/OpenMPT/libopenmpt/dox/changelog.md
Modified: trunk/OpenMPT/README.md
===================================================================
--- trunk/OpenMPT/README.md 2015-04-16 13:30:33 UTC (rev 4933)
+++ trunk/OpenMPT/README.md 2015-04-16 18:59:30 UTC (rev 4934)
@@ -142,6 +142,10 @@
which will try to guess the compiler based on your operating system.
+ GCC versions 4.1 and 4.2 are partially supported, run:
+
+ make CONFIG=gcc ANCIENT=1
+
- emscripten (on Unix-like systems):
libopenmpt has been tested and verified to work with emscripten 1.21 or
Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-16 13:30:33 UTC (rev 4933)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-16 18:59:30 UTC (rev 4934)
@@ -19,7 +19,7 @@
preferred backend because SDL is more widespread and better tested on all
kinds of different platforms, and in generel, SDL is just more reliable.
- * libopenmpt now also supports GCC 4.3.
+ * [Bug] libopenmpt now also compiles with GCC 4.3.
* libopenmpt now supports PLM (Disorder Tracker 2) files.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-17 13:58:18
|
Revision: 4938
http://sourceforge.net/p/modplug/code/4938
Author: manxorist
Date: 2015-04-17 13:58:11 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[Fix] Naming our noinline macro exactly so conflicts with the use of "__declspec(noinline)" in system headers as seen with the VS2013 provided SDK in certain cases. Rename our macro to MPT_NOINLINE.
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.cpp
trunk/OpenMPT/common/Logging.h
trunk/OpenMPT/common/typedefs.cpp
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/Ctrl_pat.h
trunk/OpenMPT/mptrack/Ctrl_smp.h
trunk/OpenMPT/mptrack/ExceptionHandler.cpp
trunk/OpenMPT/mptrack/View_smp.h
trunk/OpenMPT/soundlib/Dither.cpp
trunk/OpenMPT/test/TestToolsLib.h
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/common/Logging.cpp
===================================================================
--- trunk/OpenMPT/common/Logging.cpp 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/common/Logging.cpp 2015-04-17 13:58:11 UTC (rev 4938)
@@ -39,8 +39,8 @@
#ifndef NO_LOGGING
-static noinline void DoLog(const mpt::log::Context &context, mpt::ustring message)
-//--------------------------------------------------------------------------------
+static MPT_NOINLINE void DoLog(const mpt::log::Context &context, mpt::ustring message)
+//------------------------------------------------------------------------------------
{
// remove eol if already present
message = mpt::String::RTrim(message, MPT_USTRING("\r\n"));
@@ -94,8 +94,8 @@
}
-static noinline void DoLog(const mpt::log::Context &context, const char *format, va_list args)
-//--------------------------------------------------------------------------------------------
+static MPT_NOINLINE void DoLog(const mpt::log::Context &context, const char *format, va_list args)
+//------------------------------------------------------------------------------------------------
{
char message[LOGBUF_SIZE];
va_list va;
@@ -201,7 +201,7 @@
g_Enabled = false;
}
-noinline void Trace(const mpt::log::Context & context)
+MPT_NOINLINE void Trace(const mpt::log::Context & context)
{
// This will get called in realtime contexts and hot paths.
// No blocking allowed here.
Modified: trunk/OpenMPT/common/Logging.h
===================================================================
--- trunk/OpenMPT/common/Logging.h 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/common/Logging.h 2015-04-17 13:58:11 UTC (rev 4938)
@@ -119,7 +119,7 @@
extern bool volatile g_Enabled;
static inline bool IsEnabled() { return g_Enabled; }
-noinline void Trace(const mpt::log::Context & contexxt);
+MPT_NOINLINE void Trace(const mpt::log::Context & contexxt);
enum ThreadKind {
ThreadKindGUI,
Modified: trunk/OpenMPT/common/typedefs.cpp
===================================================================
--- trunk/OpenMPT/common/typedefs.cpp 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/common/typedefs.cpp 2015-04-17 13:58:11 UTC (rev 4938)
@@ -18,8 +18,8 @@
#if !defined(MODPLUG_TRACKER) && defined(MPT_ASSERT_HANDLER_NEEDED)
-noinline void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg)
-//--------------------------------------------------------------------------------------------------------------
+MPT_NOINLINE void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg)
+//------------------------------------------------------------------------------------------------------------------
{
if(msg)
{
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/common/typedefs.h 2015-04-17 13:58:11 UTC (rev 4938)
@@ -99,13 +99,13 @@
// Advanced inline attributes
#if MPT_COMPILER_MSVC
#define forceinline __forceinline
-#define noinline __declspec(noinline)
+#define MPT_NOINLINE __declspec(noinline)
#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
#define forceinline __attribute__((always_inline)) inline
-#define noinline __attribute__((noinline))
+#define MPT_NOINLINE __attribute__((noinline))
#else
#define forceinline inline
-#define noinline
+#define MPT_NOINLINE
#endif
@@ -271,7 +271,7 @@
#if defined(MPT_ASSERT_HANDLER_NEEDED)
// custom assert handler needed
-noinline void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg=nullptr);
+MPT_NOINLINE void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg=nullptr);
#endif // MPT_ASSERT_HANDLER_NEEDED
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h 2015-04-17 13:58:11 UTC (rev 4938)
@@ -63,7 +63,7 @@
else if(!isSelectionKeyPressed && m_nScrollPos2nd != ORDERINDEX_INVALID) m_nScrollPos2nd = ORDERINDEX_INVALID;
};
// Why VC wants to inline this huge function is beyond my understanding...
- noinline bool SetCurSel(ORDERINDEX sel, bool bEdit = true, bool bShiftClick = false, bool bIgnoreCurSel = false, bool setPlayPos = true);
+ MPT_NOINLINE bool SetCurSel(ORDERINDEX sel, bool bEdit = true, bool bShiftClick = false, bool bIgnoreCurSel = false, bool setPlayPos = true);
BOOL UpdateScrollInfo();
void UpdateInfoText();
int GetFontWidth();
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.h 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.h 2015-04-17 13:58:11 UTC (rev 4938)
@@ -132,7 +132,7 @@
afx_msg void OnEnableStretchToSize();
afx_msg void OnEstimateSampleSize();
- noinline void SetModified(SampleHint hint, bool updateAll, bool waveformModified);
+ MPT_NOINLINE void SetModified(SampleHint hint, bool updateAll, bool waveformModified);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: trunk/OpenMPT/mptrack/ExceptionHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.cpp 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.cpp 2015-04-17 13:58:11 UTC (rev 4938)
@@ -273,8 +273,8 @@
#if defined(MPT_ASSERT_HANDLER_NEEDED)
-noinline void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg)
-//--------------------------------------------------------------------------------------------------------------
+MPT_NOINLINE void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg)
+//------------------------------------------------------------------------------------------------------------------
{
DebugReporter report(msg ? DumpModeWarning : DumpModeCrash, nullptr);
if(IsDebuggerPresent())
Modified: trunk/OpenMPT/mptrack/View_smp.h
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.h 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/mptrack/View_smp.h 2015-04-17 13:58:11 UTC (rev 4938)
@@ -62,7 +62,7 @@
DECLARE_SERIAL(CViewSample)
protected:
- noinline void SetModified(SampleHint hint, bool updateAll, bool waveformModified);
+ MPT_NOINLINE void SetModified(SampleHint hint, bool updateAll, bool waveformModified);
void UpdateScrollSize() { UpdateScrollSize(m_nZoom, true); }
void UpdateScrollSize(int newZoom, bool forceRefresh, SmpLength centeredSample = SmpLength(-1));
BOOL SetCurrentSample(SAMPLEINDEX nSmp);
Modified: trunk/OpenMPT/soundlib/Dither.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dither.cpp 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/soundlib/Dither.cpp 2015-04-17 13:58:11 UTC (rev 4938)
@@ -165,8 +165,8 @@
template<int targetbits, int channels, int ditherdepth = 1, bool triangular = false, bool shaped = true>
struct Dither_SimpleTemplate
{
-noinline void operator () (int *mixbuffer, std::size_t count, DitherSimpleState &state)
-//-------------------------------------------------------------------------------------
+MPT_NOINLINE void operator () (int *mixbuffer, std::size_t count, DitherSimpleState &state)
+//-----------------------------------------------------------------------------------------
{
STATIC_ASSERT(sizeof(int) == 4);
STATIC_ASSERT(FASTRAND_BITS * 3 >= (32-targetbits) - MIXING_ATTENUATION);
Modified: trunk/OpenMPT/test/TestToolsLib.h
===================================================================
--- trunk/OpenMPT/test/TestToolsLib.h 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/test/TestToolsLib.h 2015-04-17 13:58:11 UTC (rev 4938)
@@ -158,7 +158,7 @@
private:
template <typename Tx, typename Ty>
- noinline void TypeCompareHelper(const Tx &x, const Ty &y)
+ MPT_NOINLINE void TypeCompareHelper(const Tx &x, const Ty &y)
{
if(!IsEqual(x, y, is_integer<Tx>(), is_integer<Ty>()))
{
@@ -170,7 +170,7 @@
public:
template <typename Tfx, typename Tfy>
- noinline void operator () (const Tfx &fx, const Tfy &fy)
+ MPT_NOINLINE void operator () (const Tfx &fx, const Tfy &fy)
{
ShowStart();
try
@@ -197,7 +197,7 @@
public:
template <typename Tx, typename Ty>
- noinline void operator () (const Tx &x, const Ty &y)
+ MPT_NOINLINE void operator () (const Tx &x, const Ty &y)
{
ShowStart();
try
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2015-04-17 13:34:13 UTC (rev 4937)
+++ trunk/OpenMPT/test/test.cpp 2015-04-17 13:58:11 UTC (rev 4938)
@@ -61,18 +61,18 @@
-static noinline void TestVersion();
-static noinline void TestTypes();
-static noinline void TestMisc();
-static noinline void TestCharsets();
-static noinline void TestStringFormatting();
-static noinline void TestSettings();
-static noinline void TestStringIO();
-static noinline void TestMIDIEvents();
-static noinline void TestSampleConversion();
-static noinline void TestITCompression();
-static noinline void TestPCnoteSerialization();
-static noinline void TestLoadSaveFile();
+static MPT_NOINLINE void TestVersion();
+static MPT_NOINLINE void TestTypes();
+static MPT_NOINLINE void TestMisc();
+static MPT_NOINLINE void TestCharsets();
+static MPT_NOINLINE void TestStringFormatting();
+static MPT_NOINLINE void TestSettings();
+static MPT_NOINLINE void TestStringIO();
+static MPT_NOINLINE void TestMIDIEvents();
+static MPT_NOINLINE void TestSampleConversion();
+static MPT_NOINLINE void TestITCompression();
+static MPT_NOINLINE void TestPCnoteSerialization();
+static MPT_NOINLINE void TestLoadSaveFile();
@@ -164,8 +164,8 @@
// Test if functions related to program version data work
-static noinline void TestVersion()
-//--------------------------------
+static MPT_NOINLINE void TestVersion()
+//------------------------------------
{
//Verify that macros and functions work.
{
@@ -249,8 +249,8 @@
// Test if data types are interpreted correctly
-static noinline void TestTypes()
-//------------------------------
+static MPT_NOINLINE void TestTypes()
+//----------------------------------
{
VERIFY_EQUAL(int8_min, (std::numeric_limits<int8>::min)());
VERIFY_EQUAL(int8_max, (std::numeric_limits<int8>::max)());
@@ -392,8 +392,8 @@
#endif
-static noinline void TestStringFormatting()
-//-----------------------------------------
+static MPT_NOINLINE void TestStringFormatting()
+//---------------------------------------------
{
VERIFY_EQUAL(mpt::ToString(1.5f), "1.5");
@@ -508,8 +508,8 @@
}
-static noinline void TestMisc()
-//-----------------------------
+static MPT_NOINLINE void TestMisc()
+//---------------------------------
{
VERIFY_EQUAL(EncodeIEEE754binary32(1.0f), 0x3f800000u);
@@ -684,8 +684,8 @@
}
-static noinline void TestCharsets()
-//---------------------------------
+static MPT_NOINLINE void TestCharsets()
+//-------------------------------------
{
// MPT_UTF8 version
@@ -928,8 +928,8 @@
#endif // MODPLUG_TRACKER
-static noinline void TestSettings()
-//---------------------------------
+static MPT_NOINLINE void TestSettings()
+//-------------------------------------
{
#ifdef MODPLUG_TRACKER
@@ -1008,8 +1008,8 @@
// Test MIDI Event generating / reading
-static noinline void TestMIDIEvents()
-//-----------------------------------
+static MPT_NOINLINE void TestMIDIEvents()
+//---------------------------------------
{
uint32 midiEvent;
@@ -1824,8 +1824,8 @@
// Test file loading and saving
-static noinline void TestLoadSaveFile()
-//-------------------------------------
+static MPT_NOINLINE void TestLoadSaveFile()
+//-----------------------------------------
{
if(!ShouldRunTests())
{
@@ -1977,8 +1977,8 @@
}
-static noinline void TestITCompression()
-//--------------------------------------
+static MPT_NOINLINE void TestITCompression()
+//------------------------------------------
{
// Test loading / saving of IT-compressed samples
const int sampleDataSize = 65536;
@@ -2032,8 +2032,8 @@
// Test PC note serialization
-static noinline void TestPCnoteSerialization()
-//--------------------------------------------
+static MPT_NOINLINE void TestPCnoteSerialization()
+//------------------------------------------------
{
FileReader file;
MPT_SHARED_PTR<CSoundFile> pSndFile = mpt::make_shared<CSoundFile>();
@@ -2099,8 +2099,8 @@
// Test String I/O functionality
-static noinline void TestStringIO()
-//---------------------------------
+static MPT_NOINLINE void TestStringIO()
+//-------------------------------------
{
char src0[4] = { '\0', 'X', ' ', 'X' }; // Weird empty buffer
char src1[4] = { 'X', ' ', '\0', 'X' }; // Weird buffer (hello Impulse Tracker)
@@ -2338,8 +2338,8 @@
}
-static noinline void TestSampleConversion()
-//-----------------------------------------
+static MPT_NOINLINE void TestSampleConversion()
+//---------------------------------------------
{
uint8 *sourceBuf = new uint8[65536 * 4];
void *targetBuf = new uint8[65536 * 6];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2015-04-18 15:52:58
|
Revision: 4941
http://sourceforge.net/p/modplug/code/4941
Author: saga-games
Date: 2015-04-18 15:52:43 +0000 (Sat, 18 Apr 2015)
Log Message:
-----------
[Mod] Updated release documents
[Mod] OpenMPT: Version is now 1.24.03.00
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/include/msinttypes/OpenMPT.txt
trunk/OpenMPT/include/r8brain/OpenMPT.txt
trunk/OpenMPT/installer/packageTemplate/readme.txt
trunk/OpenMPT/packageTemplate/History.txt
trunk/OpenMPT/packageTemplate/OMPT_1.24_ReleaseNotes.html
trunk/OpenMPT/packageTemplate/readme.txt
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/common/versionNumber.h 2015-04-18 15:52:43 UTC (rev 4941)
@@ -18,8 +18,8 @@
//Version definitions. The only thing that needs to be changed when changing version number.
#define VER_MAJORMAJOR 1
#define VER_MAJOR 24
-#define VER_MINOR 02
-#define VER_MINORMINOR 10
+#define VER_MINOR 03
+#define VER_MINORMINOR 00
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/include/msinttypes/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/msinttypes/OpenMPT.txt 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/include/msinttypes/OpenMPT.txt 2015-04-18 15:52:43 UTC (rev 4941)
@@ -1,4 +1,4 @@
-This is msinttypes from http://code.google.com/p/msinttypes .
+This is msinttypes from https://github.com/chemeris/msinttypes/ .
The header files have been moved to sperate directories so the availability to a certain compiler version can be selected by setting the include path.
VS2008 needs both, VS1010 already has stdint.h so having msinttypes completely in the include path would just totally confuse the compiler.
No further local changes were made.
Modified: trunk/OpenMPT/include/r8brain/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/r8brain/OpenMPT.txt 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/include/r8brain/OpenMPT.txt 2015-04-18 15:52:43 UTC (rev 4941)
@@ -1,4 +1,5 @@
-r8brain-free resampling library from https://code.google.com/p/r8brain-free-src/ revision 72.
+r8brain-free resampling library from https://github.com/avaneev/r8brain-free-src
+commit 15b97819a3d9cc9e2fcab6842ad7174e4f404bad.
The (non-functional) example program, DLL folder and logo file have been removed.
No further local changes have been made.
For building, premake4 is used to generate Visual Studio project files.
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2015-04-18 15:52:43 UTC (rev 4941)
@@ -94,8 +94,8 @@
PortAudio / PortMidi
--------------------
-OpenMPT uses PortAudio for WASAPI output. OpenMPT's MIDI plugins make use of the
-PortMidi library, which are both released under the MIT license.
+OpenMPT uses PortAudio for WASAPI and WDM-KS output. OpenMPT's MIDI plugins make
+use of the PortMidi library, which are both released under the MIT license.
Visit http://www.portaudio.com/ and http://portmedia.sourceforge.net/ for more
information.
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/packageTemplate/History.txt 2015-04-18 15:52:43 UTC (rev 4941)
@@ -25,6 +25,85 @@
<ks> coda / Ken Snyder
+v1.24.03.00 (18 April 2014, revision 4941)
+------------------------------------------
+General tab
+ [Fix] <js> The "Set" button for updating plugin parameters was still present by accident. Clicking the button could lead to problems with descriptive parameter values (tx eightbitbubsy).
+
+Pattern tab
+ [New] <js> Can now transpose a whole channel in all patterns via the channel header context menu (including a new shortcut).
+ [New] <js> New fade curves in amplification dialog: Exponential, Logarithmic, Square Root, Quarter Sine, Half Sine.
+ [Imp] <js> Greatly improved seek performance when "Maintain sample sync on seek" is enabled.
+ [Mod] <js> Remove arbitrary limiting of the order list scrollbar to the first stop index in MOD / XM.
+ [Fix] <js> Continuous scroll didn't work when entering chords (http://bugs.openmpt.org/view.php?id=132).
+ [Fix] <js> Volume column offset command was still being displayed in the Note Properties for IT files (http://bugs.openmpt.org/view.php?id=647).
+ [Fix] <js> When only enabling Amiga limits for MOD but not ProTracker 1/2 mode, invalid notes were not coloured as such.
+ [Fix] <js> When switching between modules or resizing the window, it was possible for the pattern display to show garbage (http://bugs.openmpt.org/view.php?id=665).
+ [Fix] <js> Clicking on the first and last item of an order selection loses the selection, like clicking any other item.
+ [Fix] <js> Seeking (with sample sync) could misbehave when encountering PC events.
+
+Sample tab
+ [New] <js> The MPTM volume column offset command has been revamped: 9 custom cue points can be selected for each sample in the waveform's context menu, which can then be triggered using o01...o09 (http://bugs.openmpt.org/view.php?id=91).
+ [New] <js> Crossfader can now use constant power (instead of constant volume) fade law for even smoother loop transitions. The sample can now optionally be faded back to its original content after the loop end.
+ [New] <js> New fade curves in amplification dialog: Exponential, Logarithmic, Square Root, Quarter Sine, Half Sine.
+ [Mod] <js> Middle-C finetune adjustments are now made in cents (1/100th of a semitone) instead of Hertz.
+ [Fix] <js> Inputting a new middle-C frequency created an undo step for every entered digit.
+ [Fix] <js> Pitch shift was broken for stereo samples.
+
+Instrument tab
+ [New] <js> Can now load and save envelopes (http://bugs.openmpt.org/view.php?id=398).
+ [Imp] <js> Entering a negative envelope scaling factor also yields sensible results for the volume and filter envelope now.
+ [Mod] <js> Apply DNA and NNA settings to released notes when previewing notes (http://bugs.openmpt.org/view.php?id=437).
+
+Tree view
+ [Imp] <js> Show the missing samples dialog when using "Reload All" if there are any missing samples left.
+ [Fix] <js> Samples preview was detuned for some samples (http://bugs.openmpt.org/view.php?id=14).
+
+Mod Conversion
+ [Fix] <js> Tempo commands broke when converting XM to MOD.
+
+VST / DMO Plugins
+ [New] <js> Plugin editors now have minimize / maximize buttons, which can be used to shrink a plugin window to only display the title and menu bar.
+
+Playback
+ [Fix] <js> With "loop song" disabled, the loop detection was a bit too aggressive and would stop playback when encountering nested pattern loops.
+
+IT
+ [Fix] <js> Tick-0 effects were not executed on the first tick of row repetitions (pattern delay effect) since OpenMPT 1.23.
+
+XM
+ [Fix] <js> Out-of-range global volume commands should not be ignored in XM (fixes "Reflecter" by Zodiak).
+
+S3M
+ [Fix] <js> Properly limit sample frequency and cut the sample when sliding too high.
+ [Fix] <js> Tick-0 effects were not executed on the first tick of row repetitions (pattern delay effect) since OpenMPT 1.23.
+
+MOD::Loading
+ [Imp] <js> VBlank heuristic: Do not use VBlank timing if it results in a longer tune than regular CIA timing (http://bugs.openmpt.org/view.php?id=654).
+
+MOD::ProTracker 1/2 Mode
+ [New] <js> Support for ProTracker oneshot loops: If the loop start is right at the start of the sample, play through the whole sample once and then repeat just the loop part.
+
+Other formats
+ [New] <js> Can now read PLM (Disorder Tracker 2) files.
+ [Mod] <js> Allow loading PAT instruments with 0 layers (such as DOO.PAT from the original GUS sample set).
+ [Fix] <js> PTM: The weird behaviour of the panning command I observed was due to DOSBox' broken GUS panning. Now panning commands are imported as expected again.
+
+Audio I/O
+ [Mod] <jh> Allow smaller buffer sizes for Wave Out devices.
+
+Misc
+ [Imp] <js> Song length estimation: Properly handle panning, parameter extension (#xx), and tempo / volume slides that are on the same row as a set speed effect.
+ [Imp] <jh> VU meter's decay speed is now configurable via hidden setting VuMeterDecaySpeedDecibelPerSecond in [Display]. Default value is 88.
+ [Mod] <js> No longer mark module as modified when switching between sequences (http://bugs.openmpt.org/view.php?id=141).
+ [Mod] <js> Update UnRAR library to version 5.2.6.
+ [Fix] <js> The bold and italic styles were ignored on custom pattern and comments fonts.
+ [Fix] <js> It was possible to switch song tabs while being in a modal dialog, which could lead to crashes when exiting the dialog.
+ [Fix] <js> Tooltips were missing in some windows in the 32-bit build (http://bugs.openmpt.org/view.php?id=646).
+ [Fix] <js> Channel Manager window was not sized properly.
+ [Fix] <jh> OpenMPT 1.24 was previously no longer running on Windows 98 + KernelEx.
+
+
v1.24.02.00 (16 February 2014, revision 4761)
---------------------------------------------
Pattern tab
@@ -202,7 +281,7 @@
[Fix] <js> Removing unused samples no longer creates two undo points per sample.
Audio I/O
- [New] <jh> Support direct mode for WaveOut devices. This is mostly useful on Wine systems where it (for certain setups) prevents the Wine-internal resampler from kicking in.
+ [New] <jh> Support direct mode for Wave Out devices. This is mostly useful on Wine systems where it (for certain setups) prevents the Wine-internal resampler from kicking in.
[Imp] <jh> Increased latency and period precision to allow sub-millisecond latencies.
[Imp] <jh> Added per-device type default audio settings.
[Mod] <jh> Query PortAudio for the default latency of PortAudio sound devices.
@@ -236,7 +315,7 @@
Pattern tab
[Imp] <js> "Edit Plugin assigned to PC Event" shortcut is now "Toggle PC Event/instrument plugin editor" (can now also be used to toggle the editor of the plugin assigned to the currently selected instrument).
[Imp] <js> Deleting and inserting items in the order list automatically adjusts playback, sequence override and play lock positions.
- [Imp] <js> Greatly improve seek speed when "Maintain sample sync on seek" is enabled and there are samples with very small loops.
+ [Imp] <js> Greatly improve seek performance when "Maintain sample sync on seek" is enabled and there are samples with very small loops.
[Imp] <js> When inserting a new pattern while a +++ or --- pattern is focussed in the order list, use the currently edited pattern for determining the new pattern's length.
[Fix] <js> In windowed mode, the note properties dialog was not always visible.
[Fix] <js> The order list's scrollbar's "Right Edge" menu entry was not working (http://bugs.openmpt.org/view.php?id=567).
@@ -278,7 +357,7 @@
MOD::ProTracker 1/2 Mode
[Fix] <js> ProTracker applies instrument changes on the first tick, even if there's a note delay (http://bugs.openmpt.org/view.php?id=574).
- [Fix] <js> Properly implemented ProTracker-style sample swapping, which is only supposed to happend at the end of the sample and not instantly.
+ [Fix] <js> Properly implemented ProTracker-style sample swapping, which is only supposed to happen at the end of the sample and not instantly.
[Fix] <js> Correctly handle a few more edge cases of ProTracker-style 9xx offset handling.
Misc
@@ -337,7 +416,7 @@
Audio I/O
[Mod] <jh> Default to 16-bit output on Wine, since some Wine versions apparently have problems with sample formats > 16bit.
[Fix] <jh> DirectSound: Emulated drivers do not support primary buffer access. Actually test whether the device is emulated or not and do not advertise primary buffer support if it is.
- [Fix] <jh> Fix clamping / rounding of WaveOut and DirectSound buffer sizes for 24bit samples (http://bugs.openmpt.org/view.php?id=540).
+ [Fix] <jh> Fix clamping / rounding of Wave Out and DirectSound buffer sizes for 24bit samples (http://bugs.openmpt.org/view.php?id=540).
Misc
[Imp] <js> When loading plugins during startup, the error message that was potentially shown didn't appear in the task bar, making it easy to forget about such a half-initialized OpenMPT instance.
@@ -576,7 +655,7 @@
[Fix] <js> Fixed possible freeze during start on Windows XP during Kernel Streaming initialization (patch from http://sourceforge.net/p/audacity/mailman/message/31421748/, tx Tomoya).
Misc
- [New] <js> Added (experimental) feature to add existing modules to a currently open module. This copies over all pattern, samples, instruments, plugins, etc. as far as it's possible.
+ [New] <js> Added (experimental) feature to append existing modules to a currently open module. This copies over all pattern, samples, instruments, plugins, etc. as far as it's possible.
[New] <js> Added hidden setting for loading a default template (DefaultTemplate in [Paths] section, can be either a full path or just a filename that can be found in the template folder, http://bugs.openmpt.org/view.php?id=476).
[New] <js> MIDI Mapping does now also work with aftertouch messages.
[New] <js> Added a "Samples" tab to the options dialog which exposes all previously hidden sample and instrument editor options. Two new key behaviours for how to stop sample editor note previews have been added.
@@ -1215,7 +1294,7 @@
[Fix] <js> AMF (ASYLUM) Loader: Transposed samples will now play correctly, default speed / tempo are not ignored anymore.
Audio I/O
- [Mod] <js> Since the DirectSound driver seems to be buggy (see various reports on the issue tracker), OpenMPT defaults to WaveOut now if there's no ASIO driver present.
+ [Mod] <js> Since the DirectSound driver seems to be buggy (see various reports on the issue tracker), OpenMPT defaults to Wave Out now if there's no ASIO driver present.
Misc
[New] <js> Wave Export: Added option to loop a song a given number of times during export (http://bugs.openmpt.org/view.php?id=221).
@@ -2327,7 +2406,7 @@
MOD
[Imp] <js> Mod Creation: The default empty order list was too long, allowing for overly long songs to be created which would then not be saved correctly.
[Fix] <js> Mod Creation: MOD Panning scheme is now set up correctly.
- [Fix] <js> Loading: 8Chn Startrekker modules ("FLT8") are loaded correctly now.
+ [Fix] <js> 8-channel Startrekker modules ("FLT8") are loaded correctly now.
MOD::Playback compatibility
[New] <js> Added song flag "ProTracker 1.x Mode" (for .MOD files) that enabled on-the-fly sample swapping as ProTracker did it. 8xx and E8x panning commands are also ignored in this mode.
@@ -2521,7 +2600,7 @@
[Fix] <js> Compatibility Export: Doesn't screw up patterns anymore if the module has more than 64 channels.
[Fix] <js> Compatibility Export: Changes various version numbers and settings in compatibility export to better match Impulse Tracker made IT files.
[Fix] <js> Limit fadeout values properly.
- [Fix] <al> Channel settings(volume & panning) for channels after 64 will now be saved in the file.
+ [Fix] <al> Channel settings (volume & panning) for channels after 64 will now be saved in the file.
IT::Loading
[Imp] <js> Can now load IT files with very small patterns (< 4 rows).
@@ -2633,7 +2712,7 @@
[New] <js> Can now import IMF (Imago Orpheus) modules.
[New] <js> Can now import GDM (General Digital Music / BWSB sound system) files.
[Fix] <js> A brand new PSM loader! Ditched the old and buggy loader as the new loader works way better, it can even handle modules from Extreme Pinball.
- [Fix] <js> 669 Loader: Small modification so corehop.669 can be loaded; Note: Loader is still buggy like hell.
+ [Fix] <js> 669 Loader: Small modification so corehop.669 can be loaded; Note: Loader is still buggy.
Misc
[New] <js> Compo cleanup.
@@ -2823,7 +2902,7 @@
[Mod] <al> .bak-files won't now be shown with "All modules" filter when loading modules.
[Mod] <al> MPTm made with this version will be recognized as IT in earlier versions.
[Mod] <al> Various validity checks for read data in ITP loading.
- [Fix] <al> Fixed sending wrong MIDI message in ::MidiCC.
+ [Fix] <al> Fixed sending wrong MIDI message in VSTi volume command handling when set to control MIDI Volume.
[Fix] <al> Default VST editor preset field name validation in the menu bar.
[Fix] <al> Fix for pattern duplicate for small patterns (http://forum.openmpt.org/index.php?topic=1747.0).
[Fix] <al> Fixed song properties-menu entry in mainframe(was greyed and didn't show keyshortcut)
@@ -3490,7 +3569,7 @@
[New] Channel manager window.
[New] Keyboard split - allows you to have 2 active instruments, distinguishable by the note you enter.
[New] Second channel record group - if enabled, chords for instrument 1 go to channel group 1, whereas notes for instrument 2 go to channel group 2. In the future all notes will be redirected to the appropriate record channels iff they are enabled.
- [New] WAV export update (24 bits wave out + channel-based wave files output mode)
+ [New] WAV export update (24 bits + channel-based wave files output mode)
[New] Tempo / speed / volume (in general tab) realtime update + tempo up to 512 bpm
[New] Option to free associate samples when removing one or more instrument(s)
[New] Polyphase interpolation on stereo samples.
@@ -3508,7 +3587,7 @@
[Reg] Can no longer select "Normalize" when writing to wave, as this can produce incorrect output with certain VSTs.
For now, use an external editor to normalize you wavs.
[Fix] Extra safety checks for plugins that don't return parameters between 0 and 1 exactly.
- [Fix] Tentative fix to silent dx plugins on non SSE enabled cpus.
+ [Fix] Tentative fix to silent DX plugins on non SSE enabled cpus.
[New] Added "IT Style" clear field commands. Using this, clearing the note field automatically clears the instrument field.
[Mod] Swapped left and right mouse button action in effect visualiser (now use left button to "paint" nodes, right to move a specific node).
[New] "Fill gaps" mode in effect visualiser, to automatically enter effects in blank spaces.
Modified: trunk/OpenMPT/packageTemplate/OMPT_1.24_ReleaseNotes.html
===================================================================
--- trunk/OpenMPT/packageTemplate/OMPT_1.24_ReleaseNotes.html 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/packageTemplate/OMPT_1.24_ReleaseNotes.html 2015-04-18 15:52:43 UTC (rev 4941)
@@ -118,12 +118,18 @@
<li>Song length estimation can now show the length of all <strong>"hidden" subtunes</strong> in the current sequence.</li>
<li>Many small improvements in the audio output code again, also to improve performance on Wine systems.</li>
<li>Made the <strong>MIDI Mapping dialog</strong>'s mapping list more human-readable.</li>
+ <li>New <strong>fade curves</strong> in pattern and sample amplification dialog: Exponential, Logarithmic, Square Root, Quarter Sine, Half Sine.</li>
+ <li>Greatly <strong>improved seek performance</strong> when "Maintain sample sync on seek" is enabled.</li>
+ <li>The MPTM <strong>volume column offset</strong> command has been revamped: 9 custom cue points can be selected for each sample in the waveform's context menu, which can then be triggered using <pre>o01</pre>...<pre>o09.</pre></li>
</ul>
<h3>Pattern Editor</h3>
<ul>
<li><strong>Custom pattern fonts</strong> can now be used. The built-in fonts can also be zoomed in for High-DPI devices.</li>
<li>Ctrl+(Shift+)<strong>Scroll wheel</strong> can now be used as a replacement for the "(Coarse) Data Entry" shortcuts.</li>
+ <li>Can now transpose a whole channel in all patterns via the channel header context menu.</li>
+ <li>No longer mark module as modified when switching between sequences.</li>
+ <li>When jumping around in the order list, panning, parameter extension (#xx), and tempo / volume slides that are on the same row as a set speed effect are now applied properly.</li>
</ul>
<h3>Tree view</h3>
@@ -137,6 +143,7 @@
<ul>
<li>When adding a new plugin through the plugin manager that is <strong>missing from some open file</strong>, it is now automatically loaded and restored in that file.</li>
<li>"Randomize Parameters" now applies a <strong>customizable randomization factor</strong> - much more useful than completely random parameters.</li>
+ <li>Plugin editors now have <strong>minimize / maximize</strong> buttons, which can be used to shrink a plugin window to only display the title and menu bar.</li>
</ul>
<h3>Sample Editor</h3>
@@ -145,6 +152,8 @@
<li><strong>Adjusting the sample frequency</strong> updates all playing notes' sample frequency immediately (only in IT and MPTM).</li>
<li><strong>Custom background</strong> and selection colours.</li>
<li><strong>Rearranging samples</strong> (e.g. through song cleanup or the tree view) no longer messes up the undo buffer history.</li>
+ <li>Crossfader can now use constant power (instead of constant volume) fade law for <strong>even smoother loop transitions</strong>. The sample can now optionally be faded back to its original content after the loop end.</li>
+ <li>Middle-C <strong>finetune adjustments</strong> are now made in cents (1/100th of a semitone) instead of Hertz.</li>
</ul>
<h3>Instrument Editor</h3>
@@ -152,6 +161,8 @@
<li>ITI instrument files can now contain <strong>external samples</strong> (like MPTM files, see above). Select "Impulse Tracker Instruments with external Samples" from the save dialog.</li>
<li>When previewing instruments with a fadeout value of 0, instantly stop them on key-up instead of letting them play forever.</li>
<li>The first instrument of a <strong>soundfont can now be loaded directly</strong> without registering the soundfont in OpenMPT. Useful for single-instrument soundfonts.</li>
+ <li>Can now <strong>load and save instrument envelopes</strong> independently from whole instruments.</li>
+ <li>Apply DNA and NNA settings to released notes when previewing notes.</li>
</ul>
<h3>Playback</h3>
@@ -164,6 +175,7 @@
<li>In all mix modes since 1.17RC2, a way too long volume ramp (some times up to 100 times longer than the user-supplied ramp setup) was applied for extreme global volume changes. This is now disabled except for legacy 1.17RC2 mix mode.</li>
<li>Re-implemented <strong>stereo separation</strong> to be applied on the master mix. This means that it also works as expected with stereo samples and plugins now.</li>
<li><strong>Linear frequency slide</strong> mode (in all formats except XM, which already worked as intended) has been re-implemented to fix some unwanted inaccuracies which can add up very quickly when using extra-fine slides.</li>
+ <li>Support for <strong>ProTracker oneshot loops</strong> in ProTracker 1/2 mode: If the loop start is right at the start of the sample, play through the whole sample once and then repeat just the loop part.</li>
</ul>
<h3>File Format Support</h3>
@@ -172,7 +184,7 @@
<li>Use "normal" compatible mix mode instead of FT2 panning mix mode for XM files that were compatibility-exported with OpenMPT 1.22 or older, and XM files made with other trackers that use linear panning.</li>
<li><strong>Compatible playback mode for S3M</strong>: When enabled, OpenMPT emulates certain ScreamTracker quirks as it did until now (linked pattern effect memory and ignored effects on muted channels). Compatible mode is disabled automatically for files made with less compatible trackers. S3M files made with OpenMPT always have this mode enabled, and its state is not saved in S3M files.</li>
<li><strong>Amiga frequency limits</strong> can now also be enforced in MOD files without activating ProTracker 1/2 mode.</li>
- <li>Added loading support for a MOD variant introduced by <strong>SoundTracker 2.6 and Ice Tracker</strong>.</li>
+ <li>Added loading support for a MOD variant introduced by <strong>SoundTracker 2.6 and Ice Tracker</strong> and the PLM (<strong>Disorder Tracker 2</strong>) format.</li>
<li>Completely <strong>rewrote MT2 loader</strong>. Some files that would previously not load properly do now load. Support for VST plugins, drum patterns and some extended MT2 pattern commands has been added.</li>
</ul>
Modified: trunk/OpenMPT/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/readme.txt 2015-04-17 21:33:51 UTC (rev 4940)
+++ trunk/OpenMPT/packageTemplate/readme.txt 2015-04-18 15:52:43 UTC (rev 4941)
@@ -110,8 +110,8 @@
PortAudio / PortMidi
--------------------
-OpenMPT uses PortAudio for WASAPI output. OpenMPT's MIDI plugins make use of the
-PortMidi library, which are both released under the MIT license.
+OpenMPT uses PortAudio for WASAPI and WDM-KS output. OpenMPT's MIDI plugins make
+use of the PortMidi library, which are both released under the MIT license.
Visit http://www.portaudio.com/ and http://portmedia.sourceforge.net/ for more
information.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-18 15:57:48
|
Revision: 4943
http://sourceforge.net/p/modplug/code/4943
Author: manxorist
Date: 2015-04-18 15:57:42 +0000 (Sat, 18 Apr 2015)
Log Message:
-----------
[Mod] libopenmpt: Update for -beta11.
Modified Paths:
--------------
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/libopenmpt/dox/changelog.md
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2015-04-18 15:53:30 UTC (rev 4942)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2015-04-18 15:57:42 UTC (rev 4943)
@@ -68,7 +68,7 @@
pkgconfig_DATA += libopenmpt/libopenmpt.pc
lib_LTLIBRARIES += libopenmpt.la
-libopenmpt_la_LDFLAGS = -version-info 0:10:0
+libopenmpt_la_LDFLAGS = -version-info 0:11:0
nobase_include_HEADERS += libopenmpt/libopenmpt.h libopenmpt/libopenmpt.hpp libopenmpt/libopenmpt_version.h libopenmpt/libopenmpt_config.h libopenmpt/libopenmpt_stream_callbacks_fd.h libopenmpt/libopenmpt_stream_callbacks_file.h libopenmpt/libopenmpt_ext.hpp
libopenmpt_la_CPPFLAGS = -DLIBOPENMPT_BUILD -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS) $(LTDL_CPPFLAGS)
libopenmpt_la_CXXFLAGS = $(ZLIB_CFLAGS)
Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-18 15:53:30 UTC (rev 4942)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-18 15:57:42 UTC (rev 4943)
@@ -5,7 +5,7 @@
For fully detailed change log, please see the source repository directly. This
is just a high-level summary.
-### libopenmpt svn
+### libopenmpt 0.2-beta11 (2015-04-18)
* openmpt_stream_seek_func() now gets called with OPENMPT_STREAM_SEEK_SET,
OPENMPT_STREAM_SEEK_CUR and OPENMPT_STREAM_SEEK_END whence parameter
@@ -22,7 +22,6 @@
* [Bug] libopenmpt now also compiles with GCC 4.3.
* libopenmpt now supports PLM (Disorder Tracker 2) files.
-
* Various playback improvements and fixes for IT, S3M, XM, MOD, PTM and 669
files.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2015-04-19 15:32:43
|
Revision: 4951
http://sourceforge.net/p/modplug/code/4951
Author: saga-games
Date: 2015-04-19 15:32:30 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
[Mod] Updated release documents
[Mod] OpenMPT: Version is now 1.24.04.00
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/packageTemplate/History.txt
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-04-19 14:51:57 UTC (rev 4950)
+++ trunk/OpenMPT/common/versionNumber.h 2015-04-19 15:32:30 UTC (rev 4951)
@@ -18,8 +18,8 @@
//Version definitions. The only thing that needs to be changed when changing version number.
#define VER_MAJORMAJOR 1
#define VER_MAJOR 24
-#define VER_MINOR 03
-#define VER_MINORMINOR 01
+#define VER_MINOR 04
+#define VER_MINORMINOR 00
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2015-04-19 14:51:57 UTC (rev 4950)
+++ trunk/OpenMPT/packageTemplate/History.txt 2015-04-19 15:32:30 UTC (rev 4951)
@@ -25,6 +25,24 @@
<ks> coda / Ken Snyder
+v1.24.04.00 (19 April 2014, revision 4951)
+------------------------------------------
+Pattern tab
+ [Fix] <js> Seeking with sample sync didn't apply portamento and note delay + row delay combinations accurately in some cases.
+
+Playback
+ [Fix] <js> On rows with a row delay effect, offset commands were executed on every row repetition in the previous version.
+
+IT::Compatible Playback Mode
+ [Fix] <js> Note delays are capped by the ticks per row + fine pattern delay tick count, not taking row delay into account.
+
+MOD::ProTracker 1/2 Mode
+ [Fix] <js> Instrument swapping is also applied if there was an empty sample slot "playing" (fixes arpeggios in "mr gang !!!." by arios).
+
+Other
+ [Fix] <jh> There was a major performance regression in the previous version, mostly noticeable on Wine.
+
+
v1.24.03.00 (18 April 2014, revision 4941)
------------------------------------------
General tab
@@ -40,7 +58,7 @@
[Fix] <js> When only enabling Amiga limits for MOD but not ProTracker 1/2 mode, invalid notes were not coloured as such.
[Fix] <js> When switching between modules or resizing the window, it was possible for the pattern display to show garbage (http://bugs.openmpt.org/view.php?id=665).
[Fix] <js> Clicking on the first and last item of an order selection loses the selection, like clicking any other item.
- [Fix] <js> Seeking (with sample sync) could misbehave when encountering PC events.
+ [Fix] <js> Seeking with sample sync could misbehave when encountering PC events.
Sample tab
[New] <js> The MPTM volume column offset command has been revamped: 9 custom cue points can be selected for each sample in the waveform's context menu, which can then be triggered using o01...o09 (http://bugs.openmpt.org/view.php?id=91).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-19 15:35:23
|
Revision: 4953
http://sourceforge.net/p/modplug/code/4953
Author: manxorist
Date: 2015-04-19 15:35:10 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
[Mod] libopenmpt: Update for -beta12.
Modified Paths:
--------------
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/libopenmpt/dox/changelog.md
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2015-04-19 15:32:59 UTC (rev 4952)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2015-04-19 15:35:10 UTC (rev 4953)
@@ -68,7 +68,7 @@
pkgconfig_DATA += libopenmpt/libopenmpt.pc
lib_LTLIBRARIES += libopenmpt.la
-libopenmpt_la_LDFLAGS = -version-info 0:11:0
+libopenmpt_la_LDFLAGS = -version-info 0:12:0
nobase_include_HEADERS += libopenmpt/libopenmpt.h libopenmpt/libopenmpt.hpp libopenmpt/libopenmpt_version.h libopenmpt/libopenmpt_config.h libopenmpt/libopenmpt_stream_callbacks_fd.h libopenmpt/libopenmpt_stream_callbacks_file.h libopenmpt/libopenmpt_ext.hpp
libopenmpt_la_CPPFLAGS = -DLIBOPENMPT_BUILD -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS) $(LTDL_CPPFLAGS)
libopenmpt_la_CXXFLAGS = $(ZLIB_CFLAGS)
Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-19 15:32:59 UTC (rev 4952)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md 2015-04-19 15:35:10 UTC (rev 4953)
@@ -5,6 +5,13 @@
For fully detailed change log, please see the source repository directly. This
is just a high-level summary.
+### libopenmpt 0.2-beta12 (2015-04-19)
+
+ * Playback fix when row delay effect is used together with offset command.
+ * A couple of fixes for the seek.sync_samples=1 case.
+ * IT compatibility fix fot IT note delay.
+ * ProTracker MOD placback compatibility improvement.
+
### libopenmpt 0.2-beta11 (2015-04-18)
* openmpt_stream_seek_func() now gets called with OPENMPT_STREAM_SEEK_SET,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2015-04-21 18:00:45
|
Revision: 4957
http://sourceforge.net/p/modplug/code/4957
Author: saga-games
Date: 2015-04-21 18:00:31 +0000 (Tue, 21 Apr 2015)
Log Message:
-----------
[Fix] Make note and data entry shortcuts always operate on octaves instead of +/- 12 notes when using custom tunings (http://bugs.openmpt.org/view.php?id=681)
[Mod] OpenMPT: Version is now 1.24.04.01
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/View_pat.h
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-04-19 17:28:15 UTC (rev 4956)
+++ trunk/OpenMPT/common/versionNumber.h 2015-04-21 18:00:31 UTC (rev 4957)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 24
#define VER_MINOR 04
-#define VER_MINORMINOR 00
+#define VER_MINORMINOR 01
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2015-04-19 17:28:15 UTC (rev 4956)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2015-04-21 18:00:31 UTC (rev 4957)
@@ -85,12 +85,12 @@
DefineKeyCommand(kcPatternPlayRow, 1002, _T("Play Row"));
DefineKeyCommand(kcCursorCopy, 1003, _T("Quick Copy"));
DefineKeyCommand(kcCursorPaste, 1004, _T("Quick Paste"));
- DefineKeyCommand(kcChannelMute, 1005, _T("Mute current Channel"));
- DefineKeyCommand(kcChannelSolo, 1006, _T("Solo current Channel"));
+ DefineKeyCommand(kcChannelMute, 1005, _T("Mute Current Channel"));
+ DefineKeyCommand(kcChannelSolo, 1006, _T("Solo Current Channel"));
DefineKeyCommand(kcTransposeUp, 1007, _T("Transpose +1"));
DefineKeyCommand(kcTransposeDown, 1008, _T("Transpose -1"));
- DefineKeyCommand(kcTransposeOctUp, 1009, _T("Transpose +12"));
- DefineKeyCommand(kcTransposeOctDown, 1010, _T("Transpose -12"));
+ DefineKeyCommand(kcTransposeOctUp, 1009, _T("Transpose +1 Octave"));
+ DefineKeyCommand(kcTransposeOctDown, 1010, _T("Transpose -1 Octave"));
DefineKeyCommand(kcSelectColumn, 1011, _T("Select channel / Select all"));
DefineKeyCommand(kcPatternAmplify, 1012, _T("Amplify selection"));
DefineKeyCommand(kcPatternSetInstrument, 1013, _T("Apply current instrument"));
@@ -598,8 +598,8 @@
DefineKeyCommand(kcVSTGUIBypassPlug, 1841, _T("Bypass Plugin"));
DefineKeyCommand(kcInsNoteMapTransposeDown, 1842, _T("Transpose -1 (Note Map)"));
DefineKeyCommand(kcInsNoteMapTransposeUp, 1843, _T("Transpose +1 (Note Map)"));
- DefineKeyCommand(kcInsNoteMapTransposeOctDown, 1844, _T("Transpose -12 (Note Map)"));
- DefineKeyCommand(kcInsNoteMapTransposeOctUp, 1845, _T("Transpose +12 (Note Map)"));
+ DefineKeyCommand(kcInsNoteMapTransposeOctDown, 1844, _T("Transpose -1 Octave (Note Map)"));
+ DefineKeyCommand(kcInsNoteMapTransposeOctUp, 1845, _T("Transpose +1 Octave (Note Map)"));
DefineKeyCommand(kcInsNoteMapCopyCurrentNote, 1846, _T("Map all notes to selected note"));
DefineKeyCommand(kcInsNoteMapCopyCurrentSample, 1847, _T("Map all notes to selected sample"));
DefineKeyCommand(kcInsNoteMapReset, 1848, _T("Reset Note Mapping"));
@@ -663,8 +663,8 @@
DefineKeyCommand(kcFileAppend, 1906, _T("File/Append Module"));
DefineKeyCommand(kcSampleTransposeUp, 1907, _T("Transpose +1"));
DefineKeyCommand(kcSampleTransposeDown, 1908, _T("Transpose -1"));
- DefineKeyCommand(kcSampleTransposeOctUp, 1909, _T("Transpose +12"));
- DefineKeyCommand(kcSampleTransposeOctDown, 1910, _T("Transpose -12"));
+ DefineKeyCommand(kcSampleTransposeOctUp, 1909, _T("Transpose +1 Octave"));
+ DefineKeyCommand(kcSampleTransposeOctDown, 1910, _T("Transpose -1 Octave"));
DefineKeyCommand(kcPatternInterpolateInstr, 1911, _T("Interpolate Instrument"));
DefineKeyCommand(kcDummyShortcut, 1912, _T("Dummy Shortcut"));
DefineKeyCommand(kcSampleUpsample, 1913, _T("Upsample"));
@@ -681,7 +681,7 @@
for(int j = kcStartSampleCues; j <= kcEndSampleCues; j++)
{
TCHAR s[32];
- wsprintf(s, "Preview Sample Cue %u", j - kcStartSampleCues + 1);
+ wsprintf(s, _T("Preview Sample Cue %u"), j - kcStartSampleCues + 1);
DefineKeyCommand((CommandID)j, 1924 + j - kcStartSampleCues, s);
}
@@ -843,7 +843,7 @@
//Needs refactoring. Maybe make lots of Rule subclasses, each with their own Enforce() method?
KeyCombination curKc; // for looping through key combinations
KeyCombination newKc; // for adding new key combinations
- CString report="";
+ CString report;
if(enforceRule[krAllowNavigationWithSelection])
{
@@ -1022,9 +1022,7 @@
if (enforceRule[krAutoSelectOff])
{
KeyCombination newKcDeSel;
- bool ruleApplies = true;
CommandID cmdOff = kcNull;
-
switch (inCmd)
{
case kcSelect: cmdOff = kcSelectOff; break;
@@ -1033,11 +1031,9 @@
case kcCopySelectWithNav: cmdOff = kcCopySelectOffWithNav; break;
case kcSelectWithCopySelect: cmdOff = kcSelectOffWithCopySelect; break;
case kcCopySelectWithSelect: cmdOff = kcCopySelectOffWithSelect; break;
-
- default: ruleApplies = false;
}
- if(ruleApplies)
+ if(cmdOff != kcNull)
{
newKcDeSel = inKc;
newKcDeSel.EventType(kKeyEventUp);
@@ -1511,7 +1507,7 @@
fprintf(outStream, "//----------------------------------------------------------------------\n");
fprintf(outStream, "version:%u\n", KEYMAP_VERSION);
- for (int ctx=0; ctx<kCtxMaxInputContexts; ctx++)
+ for (int ctx = 0; ctx < kCtxMaxInputContexts; ctx++)
{
fprintf(outStream, "\n//----( %s (%d) )------------\n", KeyCombination::GetContextText((InputTargetContext)ctx), ctx);
@@ -1545,7 +1541,7 @@
//---------------------------------------------------------------------------------------------------------------
{
KeyCombination kc;
- CommandID cmd=kcNumCommands;
+ CommandID cmd = kcNumCommands;
char s[1024];
CString curLine, token;
int commentStart;
@@ -1915,10 +1911,9 @@
if(codeNmod != -1)
{
kc.KeyCode(LOBYTE(codeNmod));
- kc.Modifier(0);
// Don't add modifier keys, since on French keyboards, numbers are input using Shift.
// We don't really want that behaviour here, and I'm sure we don't want that in other cases on other layouts as well.
- //kc.Modifier(HIBYTE(codeNmod) & 0x07); //We're only interest in the bottom 3 bits.
+ kc.Modifier(0);
Add(kc, cmd, true);
}
@@ -2025,7 +2020,5 @@
return m_isParentContext[kc1.Context()][kc2.Context()] || m_isParentContext[kc2.Context()][kc1.Context()];
}
-//end rewbs.customKeys
-
OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2015-04-19 17:28:15 UTC (rev 4956)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2015-04-21 18:00:31 UTC (rev 4957)
@@ -470,6 +470,12 @@
if(nAmount == 0) return;
ModInstrument *pIns = m_modDoc.GetrSoundFile().Instruments[m_nInstrument];
+ if((nAmount == 12 || nAmount == -12) && pIns->pTuning != nullptr)
+ {
+ // Special case for instrument-specific tunings
+ nAmount = pIns->pTuning->GetGroupSize() * sgn(nAmount);
+ }
+
if (pIns)
{
bool bModified = false;
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2015-04-19 17:28:15 UTC (rev 4956)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2015-04-21 18:00:31 UTC (rev 4957)
@@ -2970,6 +2970,7 @@
PrepareUndo(m_Selection, "Transpose");
+ std::vector<int> lastGroupSize(pSndFile->GetNumChannels(), 12);
for(ROWINDEX row = startRow; row <= endRow; row++)
{
PatternRow m = pSndFile->Patterns[m_nPattern].GetRow(row);
@@ -2977,7 +2978,21 @@
{
if (m[chn].IsNote())
{
- int note = m[chn].note + transp;
+ if(m[chn].instr > 0 && m[chn].instr <= pSndFile->GetNumInstruments())
+ {
+ const ModInstrument *pIns = pSndFile->Instruments[m[chn].instr];
+ if(pIns != nullptr && pIns->pTuning != nullptr)
+ {
+ lastGroupSize[chn] = pIns->pTuning->GetGroupSize();
+ }
+ }
+ int transpose = transp;
+ if(transpose == 12000 || transpose == -12000)
+ {
+ // Transpose one octave
+ transpose = lastGroupSize[chn] * sgn(transpose);
+ }
+ int note = m[chn].note + transpose;
Limit(note, noteMin, noteMax);
m[chn].note = static_cast<ModCommand::NOTE>(note);
}
@@ -3012,6 +3027,8 @@
PrepareUndo(m_Selection, "Data Entry");
+ // Notes per octave for non-TET12 tunings and coarse note steps
+ std::vector<int> lastGroupSize(pSndFile->GetNumChannels(), 12);
for(ROWINDEX row = startRow; row <= endRow; row++)
{
PatternRow m = pSndFile->Patterns[m_nPattern].GetRow(row);
@@ -3022,7 +3039,15 @@
// Increase / decrease note
if(m[chn].IsNote())
{
- int note = m[chn].note + offset * (coarse ? 12 : 1);
+ if(m[chn].instr > 0 && m[chn].instr <= pSndFile->GetNumInstruments())
+ {
+ const ModInstrument *pIns = pSndFile->Instruments[m[chn].instr];
+ if(pIns != nullptr && pIns->pTuning != nullptr)
+ {
+ lastGroupSize[chn] = pIns->pTuning->GetGroupSize();
+ }
+ }
+ int note = m[chn].note + offset * (coarse ? lastGroupSize[chn] : 1);
Limit(note, noteMin, noteMax);
m[chn].note = (ModCommand::NOTE)note;
} else if(m[chn].IsSpecialNote())
@@ -5094,8 +5119,20 @@
const ModCommand &target = GetCursorCommand();
if(target.IsNote())
{
+ int groupSize = 12;
+ if(target.instr > 0 && target.instr <= pSndFile->GetNumInstruments())
+ {
+ const ModInstrument *pIns = pSndFile->Instruments[target.instr];
+ if(pIns != nullptr && pIns->pTuning != nullptr)
+ {
+ groupSize = pIns->pTuning->GetGroupSize();
+ }
+ }
+
PrepareUndo(m_Cursor, m_Cursor, "Octave Entry");
- TempEnterNote(((target.note - NOTE_MIN) % 12) + val * 12 + NOTE_MIN);
+ // The following might look a bit convoluted... This is mostly because the "middle-C" in
+ // custom tunings always has octave 5, no matter how many octaves the tuning actually has.
+ TempEnterNote(((target.note - NOTE_MIDDLEC) % groupSize) + (val - 5) * groupSize + NOTE_MIDDLEC);
// Memorize note for key-up
ASSERT(size_t(val) < octaveKeyMemory.size());
octaveKeyMemory[val] = target.note;
Modified: trunk/OpenMPT/mptrack/View_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.h 2015-04-19 17:28:15 UTC (rev 4956)
+++ trunk/OpenMPT/mptrack/View_pat.h 2015-04-21 18:00:31 UTC (rev 4957)
@@ -413,8 +413,8 @@
afx_msg void OnVisualizeEffect(); //rewbs.fxvis
afx_msg void OnTransposeUp() { TransposeSelection(1); }
afx_msg void OnTransposeDown() { TransposeSelection(-1); }
- afx_msg void OnTransposeOctUp() { TransposeSelection(12); }
- afx_msg void OnTransposeOctDown() { TransposeSelection(-12); }
+ afx_msg void OnTransposeOctUp() { TransposeSelection(12000); }
+ afx_msg void OnTransposeOctDown() { TransposeSelection(-12000); }
afx_msg void OnTransposeCustom();
afx_msg void OnSetSelInstrument();
afx_msg void OnAddChannelFront() { AddChannelBefore(m_MenuCursor.GetChannel()); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-23 10:00:21
|
Revision: 4967
http://sourceforge.net/p/modplug/code/4967
Author: manxorist
Date: 2015-04-23 10:00:09 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
[Ref] Test: Do not rely on C-style varargs in the string formatting tests.
[Ref] Move any C-style varargs support to the only remaining user, the old Log() infrastructure, in order to avoid the need to include <cstdarg> and <stdarg.h> everywhere.
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.cpp
trunk/OpenMPT/common/stdafx.h
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/common/Logging.cpp
===================================================================
--- trunk/OpenMPT/common/Logging.cpp 2015-04-23 09:54:10 UTC (rev 4966)
+++ trunk/OpenMPT/common/Logging.cpp 2015-04-23 10:00:09 UTC (rev 4967)
@@ -18,15 +18,26 @@
#include "version.h"
#include <iostream>
+
+#include <cstdarg>
#include <cstring>
+#include <stdarg.h>
+
OPENMPT_NAMESPACE_BEGIN
//#define LOG_TO_FILE
+#if MPT_COMPILER_MSVC || (MPT_COMPILER_GCC && MPT_GCC_AT_LEAST(4,3,0) && MPT_GCC_BEFORE(4,4,0))
+#ifndef va_copy
+#define va_copy(dst, src) do { (dst) = (src); } while (0)
+#endif
+#endif
+
+
namespace mpt
{
namespace log
Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h 2015-04-23 09:54:10 UTC (rev 4966)
+++ trunk/OpenMPT/common/stdafx.h 2015-04-23 10:00:09 UTC (rev 4967)
@@ -48,7 +48,6 @@
// <memory>
// <new>
// <type_traits> // if available
-// <cstdarg>
// <cstdint>
// <stdint.h>
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2015-04-23 09:54:10 UTC (rev 4966)
+++ trunk/OpenMPT/common/typedefs.h 2015-04-23 10:00:09 UTC (rev 4967)
@@ -297,18 +297,7 @@
#endif
-OPENMPT_NAMESPACE_END
-#include <cstdarg>
-#include <stdarg.h>
-OPENMPT_NAMESPACE_BEGIN
-#if MPT_COMPILER_MSVC || (MPT_COMPILER_GCC && MPT_GCC_AT_LEAST(4,3,0) && MPT_GCC_BEFORE(4,4,0))
-#ifndef va_copy
-#define va_copy(dst, src) do { (dst) = (src); } while (0)
-#endif
-#endif
-
-
#if (MPT_COMPILER_MSVC && MPT_MSVC_BEFORE(2010,0)) || (MPT_COMPILER_GCC && MPT_GCC_BEFORE(4,3,0))
OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2015-04-23 09:54:10 UTC (rev 4966)
+++ trunk/OpenMPT/test/test.cpp 2015-04-23 10:00:09 UTC (rev 4967)
@@ -282,30 +282,19 @@
// 4. Formatting of floating point values depends on the currently set C locale.
// A library is not allowed to mock with that and thus cannot influence the behavior in this case.
-static std::string MPT_PRINTF_FUNC(1,2) StringFormat(const char * format, ...);
-
-static std::string StringFormat(const char *format, ...)
+template <typename T>
+static std::string StringFormat(const char *format, T x)
{
#if MPT_COMPILER_MSVC
- va_list argList;
- va_start(argList, format);
-
// Count the needed array size.
- const size_t nCount = _vscprintf(format, argList); // null character not included.
+ const size_t nCount = _scprintf(format, x); // null character not included.
std::vector<char> buf(nCount + 1); // + 1 is for null terminator.
- vsprintf_s(&(buf[0]), buf.size(), format, argList);
-
- va_end(argList);
+ sprintf_s(&(buf[0]), buf.size(), format, x);
return &(buf[0]);
#else
- va_list argList;
- va_start(argList, format);
- int size = vsnprintf(NULL, 0, format, argList); // get required size, requires c99 compliant vsnprintf which msvc does not have
- va_end(argList);
+ int size = snprintf(NULL, 0, format, x); // get required size, requires c99 compliant snprintf which msvc does not have
std::vector<char> temp(size + 1);
- va_start(argList, format);
- vsnprintf(&(temp[0]), size + 1, format, argList);
- va_end(argList);
+ snprintf(&(temp[0]), size + 1, format, x);
return &(temp[0]);
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-23 10:42:03
|
Revision: 4970
http://sourceforge.net/p/modplug/code/4970
Author: manxorist
Date: 2015-04-23 10:41:49 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
[Mod] Crash handler: Add [Debug]StopSoundDeviceBeforeDump (default false) setting and change the default behaviour to stop the audio device after dumping the crash information. This helps debugging crashes inside the audio thread/callback with the default settings.
[Mod] sounddev: Add DebugIsFragileDevice() and DebugInRealtimeCallback() to SoundDevice::IBase which allows audio devices to override the behaviour in case of a crash. ASIO devices sort of require this as they tend to provoke kernel crashes when not stopped and closed properly. DebugIsFragileDevice() return true for all ASIO devices and false otherwise. DebugInRealtimeCallback() is only required to be implemented when the device is flagged as fragile, otherwise it just returns false.
[Mod] Crash handler: Override the configured behaviour regarding stopping the audio device for fragile (ASIO) sound devices: In case the crash happens inside the audio callback, the device is always closed after writing out the dump. In the case the crash happens outside of the callback, the device is always closed before writing the dump.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/ExceptionHandler.cpp
trunk/OpenMPT/mptrack/ExceptionHandler.h
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/TrackerSettings.h
trunk/OpenMPT/sounddev/SoundDevice.h
trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
trunk/OpenMPT/sounddev/SoundDeviceASIO.h
Modified: trunk/OpenMPT/mptrack/ExceptionHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.cpp 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.cpp 2015-04-23 10:41:49 UTC (rev 4970)
@@ -27,6 +27,7 @@
bool ExceptionHandler::fullMemDump = false;
bool ExceptionHandler::stopSoundDeviceOnCrash = true;
+bool ExceptionHandler::stopSoundDeviceBeforeDump = false;
enum DumpMode
@@ -91,12 +92,15 @@
int rescuedFiles;
private:
static bool FreezeState(DumpMode mode);
+ static bool Cleanup(DumpMode mode);
bool GenerateDump(_EXCEPTION_POINTERS *pExceptionInfo);
bool GenerateTraceLog();
int RescueFiles();
bool HasWrittenDebug() const { return writtenMiniDump || writtenTraceLog; }
+ static void StopSoundDevice();
public:
DebugReporter(DumpMode mode, _EXCEPTION_POINTERS *pExceptionInfo);
+ ~DebugReporter();
void ReportError(CString errorMessage);
};
@@ -124,6 +128,13 @@
}
+DebugReporter::~DebugReporter()
+//-----------------------------
+{
+ Cleanup(mode);
+}
+
+
bool DebugReporter::GenerateDump(_EXCEPTION_POINTERS *pExceptionInfo)
//-------------------------------------------------------------------
{
@@ -225,27 +236,19 @@
if(mode == DumpModeCrash || mode == DumpModeWarning)
{
- // Shut down audio device...
- if(ExceptionHandler::stopSoundDeviceOnCrash)
+ if(CMainFrame::GetMainFrame() && CMainFrame::GetMainFrame()->gpSoundDevice && CMainFrame::GetMainFrame()->gpSoundDevice->DebugIsFragileDevice())
{
- CMainFrame* pMainFrame = CMainFrame::GetMainFrame();
- if(pMainFrame)
+ // For fragile devices, always stop the device. Stop before the dumping if not in realtime context.
+ if(!CMainFrame::GetMainFrame()->gpSoundDevice->DebugInRealtimeCallback())
{
- try
- {
- if(pMainFrame->gpSoundDevice)
- {
- pMainFrame->gpSoundDevice->Close();
- }
- if(pMainFrame->m_NotifyTimer)
- {
- pMainFrame->KillTimer(pMainFrame->m_NotifyTimer);
- pMainFrame->m_NotifyTimer = 0;
- }
- } catch(...)
- {
- }
+ StopSoundDevice();
}
+ } else
+ {
+ if(ExceptionHandler::stopSoundDeviceOnCrash && ExceptionHandler::stopSoundDeviceBeforeDump)
+ {
+ StopSoundDevice();
+ }
}
}
@@ -253,7 +256,57 @@
}
+void DebugReporter::StopSoundDevice()
+//-----------------------------------
+{
+ CMainFrame* pMainFrame = CMainFrame::GetMainFrame();
+ if(pMainFrame)
+ {
+ try
+ {
+ if(pMainFrame->gpSoundDevice)
+ {
+ pMainFrame->gpSoundDevice->Close();
+ }
+ if(pMainFrame->m_NotifyTimer)
+ {
+ pMainFrame->KillTimer(pMainFrame->m_NotifyTimer);
+ pMainFrame->m_NotifyTimer = 0;
+ }
+ } catch(...)
+ {
+ }
+ }
+}
+
+bool DebugReporter::Cleanup(DumpMode mode)
+//----------------------------------------
+{
+ MPT_TRACE();
+
+ if(mode == DumpModeCrash || mode == DumpModeWarning)
+ {
+ if(CMainFrame::GetMainFrame() && CMainFrame::GetMainFrame()->gpSoundDevice && CMainFrame::GetMainFrame()->gpSoundDevice->DebugIsFragileDevice())
+ {
+ // For fragile devices, always stop the device. Stop after the dumping if in realtime context.
+ if(CMainFrame::GetMainFrame()->gpSoundDevice->DebugInRealtimeCallback())
+ {
+ StopSoundDevice();
+ }
+ } else
+ {
+ if(ExceptionHandler::stopSoundDeviceOnCrash && !ExceptionHandler::stopSoundDeviceBeforeDump)
+ {
+ StopSoundDevice();
+ }
+ }
+ }
+
+ return true;
+}
+
+
// Different entry points for different situations in which we want to dump some information
Modified: trunk/OpenMPT/mptrack/ExceptionHandler.h
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.h 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.h 2015-04-23 10:41:49 UTC (rev 4970)
@@ -19,6 +19,7 @@
public:
static bool fullMemDump;
static bool stopSoundDeviceOnCrash;
+ static bool stopSoundDeviceBeforeDump;
// Call this to activate unhandled exception filtering.
static void Register() { ::SetUnhandledExceptionFilter(UnhandledExceptionFilter); };
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-04-23 10:41:49 UTC (rev 4970)
@@ -239,11 +239,13 @@
, DebugTraceSize(conf, "Debug", "TraceSize", 1000000)
, DebugTraceAlwaysDump(conf, "Debug", "TraceAlwaysDump", false)
, DebugStopSoundDeviceOnCrash(conf, "Debug", "StopSoundDeviceOnCrash", true)
+ , DebugStopSoundDeviceBeforeDump(conf, "Debug", "StopSoundDeviceBeforeDump", false)
{
// Debug
- // Duplicate state for debug stffu in order to avoid calling into settings fremwork from crash conetxt.
+ // Duplicate state for debug stuff in order to avoid calling into settings framework from crash context.
ExceptionHandler::stopSoundDeviceOnCrash = DebugStopSoundDeviceOnCrash;
+ ExceptionHandler::stopSoundDeviceBeforeDump = DebugStopSoundDeviceBeforeDump;
// Effects
#ifndef NO_DSP
Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h 2015-04-23 10:41:49 UTC (rev 4970)
@@ -568,6 +568,7 @@
Setting<bool> DebugTraceAlwaysDump;
Setting<bool> DebugStopSoundDeviceOnCrash;
+ Setting<bool> DebugStopSoundDeviceBeforeDump;
public:
Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 10:41:49 UTC (rev 4970)
@@ -533,6 +533,10 @@
virtual SoundDevice::TimeInfo GetTimeInfo() const = 0;
virtual int64 GetStreamPositionFrames() const = 0;
+ // Debugging aids in case of a crash
+ virtual bool DebugIsFragileDevice() const = 0;
+ virtual bool DebugInRealtimeCallback() const = 0;
+
// Informational only, do not use for timing.
// Use GetStreamPositionFrames() for timing
virtual SoundDevice::Statistics GetStatistics() const = 0;
@@ -667,6 +671,9 @@
SoundDevice::TimeInfo GetTimeInfo() const { return m_TimeInfo; }
int64 GetStreamPositionFrames() const;
+ virtual bool DebugIsFragileDevice() const { return false; }
+ virtual bool DebugInRealtimeCallback() const { return false; }
+
virtual SoundDevice::Statistics GetStatistics() const;
virtual bool OpenDriverSettings() { return false; };
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-04-23 10:41:49 UTC (rev 4970)
@@ -214,6 +214,9 @@
InterlockedExchange(&m_RenderingSilence, 0);
InterlockedExchange(&m_AsioRequestFlags, 0);
+
+ m_DebugRealtimeThreadID.store(0);
+
}
@@ -1104,6 +1107,20 @@
//-----------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
+ struct DebugRealtimeThreadIdGuard
+ {
+ mpt::atomic_uint32_t & ThreadID;
+ DebugRealtimeThreadIdGuard(mpt::atomic_uint32_t & ThreadID)
+ : ThreadID(ThreadID)
+ {
+ ThreadID.store(GetCurrentThreadId());
+ }
+ ~DebugRealtimeThreadIdGuard()
+ {
+ ThreadID.store(0);
+ }
+ };
+ DebugRealtimeThreadIdGuard debugThreadIdGuard(m_DebugRealtimeThreadID);
MPT_ASSERT(directProcess); // !directProcess is not handled correctly in OpenMPT, would require a separate thread and potentially additional buffering
if(!directProcess)
{
@@ -1204,6 +1221,20 @@
}
+bool CASIODevice::DebugIsFragileDevice() const
+//--------------------------------------------
+{
+ return true;
+}
+
+
+bool CASIODevice::DebugInRealtimeCallback() const
+//-----------------------------------------------
+{
+ return GetCurrentThreadId() == m_DebugRealtimeThreadID.load();
+}
+
+
SoundDevice::Statistics CASIODevice::GetStatistics() const
//--------------------------------------------------------
{
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-04-23 10:04:53 UTC (rev 4969)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-04-23 10:41:49 UTC (rev 4970)
@@ -80,6 +80,8 @@
FlagSet<AsioFeatures> m_QueriedFeatures;
FlagSet<AsioFeatures> m_UsedFeatures;
+ mutable mpt::atomic_uint32_t m_DebugRealtimeThreadID;
+
private:
void UpdateTimeInfo(AsioTimeInfo asioTimeInfo);
@@ -118,6 +120,9 @@
bool OpenDriverSettings();
+ bool DebugIsFragileDevice() const;
+ bool DebugInRealtimeCallback() const;
+
SoundDevice::Statistics GetStatistics() const;
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-23 13:03:15
|
Revision: 4974
http://sourceforge.net/p/modplug/code/4974
Author: manxorist
Date: 2015-04-23 13:03:08 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
[Ref] sounddev: Kill IFillAudioBuffer and move the responsibility of locking and unlocking the sound source to the sound device code itself instead of relying on ping-pong callback hierarchies. This simplifies the sound device interface by flattening the callback stack.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/sounddev/SoundDevice.cpp
trunk/OpenMPT/sounddev/SoundDevice.h
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2015-04-23 12:58:08 UTC (rev 4973)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2015-04-23 13:03:08 UTC (rev 4974)
@@ -177,6 +177,7 @@
// CMainFrame construction/destruction
CMainFrame::CMainFrame()
//----------------------
+ : m_SoundDeviceFillBufferCriticalSection(CriticalSection::InitialUnlocked)
{
m_NotifyTimer = 0;
gpSoundDevice = NULL;
@@ -670,16 +671,24 @@
}
-void CMainFrame::FillAudioBufferLocked(SoundDevice::IFillAudioBuffer &callback)
-//-----------------------------------------------------------------------------
+void CMainFrame::SoundSourceLock()
+//--------------------------------
{
MPT_TRACE();
- CriticalSection cs;
+ m_SoundDeviceFillBufferCriticalSection.Enter();
MPT_ASSERT_ALWAYS(m_pSndFile != nullptr);
m_AudioThreadId = GetCurrentThreadId();
mpt::log::Trace::SetThreadId(mpt::log::Trace::ThreadKindAudio, m_AudioThreadId);
- callback.FillAudioBuffer();
+}
+
+
+void CMainFrame::SoundSourceUnlock()
+//----------------------------------
+{
+ MPT_TRACE();
+ MPT_ASSERT_ALWAYS(m_pSndFile != nullptr);
m_AudioThreadId = 0;
+ m_SoundDeviceFillBufferCriticalSection.Leave();
}
@@ -705,8 +714,8 @@
};
-void CMainFrame::AudioRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer)
-//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+void CMainFrame::SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer)
+//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
ASSERT(InAudioThread());
@@ -738,8 +747,8 @@
}
-void CMainFrame::AudioDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition)
-//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+void CMainFrame::SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition)
+//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
MPT_UNREFERENCED_PARAMETER(settings);
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2015-04-23 12:58:08 UTC (rev 4973)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2015-04-23 13:03:08 UTC (rev 4974)
@@ -349,6 +349,7 @@
public:
// Low-Level Audio
+ CriticalSection m_SoundDeviceFillBufferCriticalSection;
Util::MultimediaClock m_SoundDeviceClock;
SoundDevice::IBase *gpSoundDevice;
UINT_PTR m_NotifyTimer;
@@ -408,10 +409,11 @@
void SoundSourcePreStartCallback();
void SoundSourcePostStopCallback();
bool SoundSourceIsLockedByCurrentThread() const;
- void FillAudioBufferLocked(SoundDevice::IFillAudioBuffer &callback);
- void AudioRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer);
- void AudioDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition);
-
+ void SoundSourceLock();
+ void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer);
+ void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition);
+ void SoundSourceUnlock();
+
// from SoundDevice::IMessageReceiver
void SoundDeviceMessage(LogLevel level, const mpt::ustring &str);
Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-04-23 12:58:08 UTC (rev 4973)
+++ trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-04-23 13:03:08 UTC (rev 4974)
@@ -237,14 +237,6 @@
}
-void Base::FillAudioBuffer()
-//--------------------------
-{
- MPT_TRACE();
- InternalFillAudioBuffer();
-}
-
-
uint64 Base::SourceGetReferenceClockNowNanoseconds() const
//--------------------------------------------------------
{
@@ -297,7 +289,8 @@
MPT_TRACE();
if(m_Source)
{
- m_Source->FillAudioBufferLocked(*this);
+ ISource::Guard lock(*m_Source);
+ InternalFillAudioBuffer();
}
}
@@ -337,7 +330,7 @@
{
return;
}
- m_Source->AudioRead(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, buffer);
+ m_Source->SoundSourceRead(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, buffer);
}
@@ -357,7 +350,7 @@
m_StreamPositionOutputFrames = m_StreamPositionRenderFrames - framesLatency;
framesRendered = m_StreamPositionRenderFrames;
}
- m_Source->AudioDone(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, framesRendered);
+ m_Source->SoundSourceDone(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, framesRendered);
}
Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 12:58:08 UTC (rev 4973)
+++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 13:03:08 UTC (rev 4974)
@@ -29,15 +29,6 @@
//====================
-class IFillAudioBuffer
-//====================
-{
-public:
- virtual void FillAudioBuffer() = 0;
-};
-
-
-//====================
class IMessageReceiver
//====================
{
@@ -75,9 +66,26 @@
virtual void SoundSourcePreStartCallback() = 0;
virtual void SoundSourcePostStopCallback() = 0;
virtual bool SoundSourceIsLockedByCurrentThread() const = 0;
- virtual void FillAudioBufferLocked(SoundDevice::IFillAudioBuffer &callback) = 0; // take any locks needed while rendering audio and then call FillAudioBuffer
- virtual void AudioRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer) = 0;
- virtual void AudioDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition) = 0; // in sample frames
+ virtual void SoundSourceLock() = 0;
+ virtual void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer) = 0;
+ virtual void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition) = 0; // in sample frames
+ virtual void SoundSourceUnlock() = 0;
+public:
+ class Guard
+ {
+ private:
+ ISource &m_Source;
+ public:
+ Guard(ISource &source)
+ : m_Source(source)
+ {
+ m_Source.SoundSourceLock();
+ }
+ ~Guard()
+ {
+ m_Source.SoundSourceUnlock();
+ }
+ };
};
@@ -486,7 +494,6 @@
//=========
class IBase
//=========
- : protected IFillAudioBuffer
{
protected:
@@ -497,10 +504,6 @@
virtual ~IBase() { }
-protected:
-
- virtual void FillAudioBuffer() = 0;
-
public:
virtual void SetSource(SoundDevice::ISource *source) = 0;
@@ -593,8 +596,6 @@
virtual void InternalFillAudioBuffer() = 0;
- void FillAudioBuffer();
-
uint64 SourceGetReferenceClockNowNanoseconds() const;
void SourceNotifyPreStart();
void SourceNotifyPostStop();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-23 17:48:37
|
Revision: 4975
http://sourceforge.net/p/modplug/code/4975
Author: manxorist
Date: 2015-04-23 17:48:24 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
[Ref] sounddev: Provide the instantaneous stream position also in seconds in addition to frames.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/sounddev/SoundDevice.cpp
trunk/OpenMPT/sounddev/SoundDevice.h
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2015-04-23 13:03:08 UTC (rev 4974)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2015-04-23 17:48:24 UTC (rev 4975)
@@ -596,7 +596,7 @@
int64 currenttotalsamples = 0;
if(gpSoundDevice)
{
- currenttotalsamples = gpSoundDevice->GetStreamPositionFrames();
+ currenttotalsamples = gpSoundDevice->GetStreamPosition().Frames;
}
{
// advance to the newest notification, drop the obsolete ones
@@ -747,8 +747,8 @@
}
-void CMainFrame::SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition)
-//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+void CMainFrame::SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, SoundDevice::StreamPosition streamPosition)
+//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
MPT_UNREFERENCED_PARAMETER(settings);
@@ -757,7 +757,7 @@
MPT_UNREFERENCED_PARAMETER(timeInfo);
ASSERT(InAudioThread());
OPENMPT_PROFILE_FUNCTION(Profiler::Notify);
- DoNotification(numFrames, streamPosition);
+ DoNotification(numFrames, streamPosition.Frames);
//m_pSndFile->m_TimingInfo = TimingInfo(); // reset
}
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2015-04-23 13:03:08 UTC (rev 4974)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2015-04-23 17:48:24 UTC (rev 4975)
@@ -411,7 +411,7 @@
bool SoundSourceIsLockedByCurrentThread() const;
void SoundSourceLock();
void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer);
- void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition);
+ void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, SoundDevice::StreamPosition streamPosition);
void SoundSourceUnlock();
// from SoundDevice::IMessageReceiver
Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-04-23 13:03:08 UTC (rev 4974)
+++ trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-04-23 17:48:24 UTC (rev 4975)
@@ -350,7 +350,7 @@
m_StreamPositionOutputFrames = m_StreamPositionRenderFrames - framesLatency;
framesRendered = m_StreamPositionRenderFrames;
}
- m_Source->SoundSourceDone(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, framesRendered);
+ m_Source->SoundSourceDone(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, StreamPosition(framesRendered, StreamPositionFramesToSeconds(framesRendered)));
}
@@ -428,19 +428,28 @@
}
-int64 Base::GetStreamPositionFrames() const
-//-----------------------------------------
+SoundDevice::StreamPosition Base::GetStreamPosition() const
+//---------------------------------------------------------
{
MPT_TRACE();
- if(!IsOpen()) return 0;
+ if(!IsOpen())
+ {
+ return StreamPosition();
+ }
+ if(m_Settings.Samplerate <= 0)
+ {
+ return StreamPosition();
+ }
+ int64 frames = 0;
if(InternalHasGetStreamPosition())
{
- return InternalGetStreamPositionFrames();
+ frames = InternalGetStreamPositionFrames();
} else
{
Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
- return m_StreamPositionOutputFrames;
+ frames = m_StreamPositionOutputFrames;
}
+ return StreamPosition(frames, StreamPositionFramesToSeconds(frames));
}
Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 13:03:08 UTC (rev 4974)
+++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 17:48:24 UTC (rev 4975)
@@ -52,6 +52,15 @@
};
+struct StreamPosition
+{
+ int64 Frames; // relative to Start()
+ double Seconds; // relative to Start()
+ StreamPosition() : Frames(0), Seconds(0.0) { }
+ StreamPosition(int64 frames, double seconds) : Frames(frames), Seconds(seconds) { }
+};
+
+
struct Settings;
struct Flags;
struct BufferAttributes;
@@ -68,7 +77,7 @@
virtual bool SoundSourceIsLockedByCurrentThread() const = 0;
virtual void SoundSourceLock() = 0;
virtual void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer) = 0;
- virtual void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, int64 streamPosition) = 0; // in sample frames
+ virtual void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, SoundDevice::StreamPosition streamPosition) = 0;
virtual void SoundSourceUnlock() = 0;
public:
class Guard
@@ -534,7 +543,7 @@
virtual SoundDevice::BufferAttributes GetEffectiveBufferAttributes() const = 0;
virtual SoundDevice::TimeInfo GetTimeInfo() const = 0;
- virtual int64 GetStreamPositionFrames() const = 0;
+ virtual SoundDevice::StreamPosition GetStreamPosition() const = 0;
// Debugging aids in case of a crash
virtual bool DebugIsFragileDevice() const = 0;
@@ -615,6 +624,8 @@
void UpdateTimeInfo(SoundDevice::TimeInfo timeInfo);
+ double StreamPositionFramesToSeconds(int64 frames) const { return static_cast<double>(frames) / static_cast<double>(m_Settings.Samplerate); }
+
virtual bool InternalHasTimeInfo() const { return false; }
virtual bool InternalHasGetStreamPosition() const { return false; }
@@ -670,7 +681,7 @@
SoundDevice::BufferAttributes GetEffectiveBufferAttributes() const { return (IsOpen() && IsPlaying()) ? InternalGetEffectiveBufferAttributes() : SoundDevice::BufferAttributes(); }
SoundDevice::TimeInfo GetTimeInfo() const { return m_TimeInfo; }
- int64 GetStreamPositionFrames() const;
+ SoundDevice::StreamPosition GetStreamPosition() const;
virtual bool DebugIsFragileDevice() const { return false; }
virtual bool DebugInRealtimeCallback() const { return false; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-23 19:42:36
|
Revision: 4977
http://sourceforge.net/p/modplug/code/4977
Author: manxorist
Date: 2015-04-23 19:42:21 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
[Ref] build: Move premake4 files for external libraries from include/ to build/premake4-win/. Adjust pathnames in premake files accordingly. No changes in generated project files.
Modified Paths:
--------------
trunk/OpenMPT/build/premake4.lua
Added Paths:
-----------
trunk/OpenMPT/build/premake4-win/
trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua
Removed Paths:
-------------
trunk/OpenMPT/include/UnRAR.premake4.lua
trunk/OpenMPT/include/flac.premake4.lua
trunk/OpenMPT/include/lhasa.premake4.lua
trunk/OpenMPT/include/miniz.premake4.lua
trunk/OpenMPT/include/minizip.premake4.lua
trunk/OpenMPT/include/portaudio.premake4.lua
trunk/OpenMPT/include/portmidi.premake4.lua
trunk/OpenMPT/include/pugixml.premake4.lua
trunk/OpenMPT/include/r8brain.premake4.lua
trunk/OpenMPT/include/smbPitchShift.premake4.lua
trunk/OpenMPT/include/soundtouch.premake4.lua
trunk/OpenMPT/include/zlib.premake4.lua
Index: trunk/OpenMPT/build/premake4-win
===================================================================
--- trunk/OpenMPT/build/premake4-win 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/build/premake4-win 2015-04-23 19:42:21 UTC (rev 4977)
Property changes on: trunk/OpenMPT/build/premake4-win
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Copied: trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua (from rev 4975, trunk/OpenMPT/include/UnRAR.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,130 @@
+
+ project "UnRAR"
+ uuid "95CC809B-03FC-4EDB-BB20-FD07A698C05F"
+ language "C++"
+ location "../../build/gen"
+ objdir "../../build/obj/unrar"
+ includedirs { "../../include/unrar" }
+ files {
+ "../../include/unrar/archive.cpp",
+ "../../include/unrar/arcread.cpp",
+ "../../include/unrar/blake2s.cpp",
+ "../../include/unrar/cmddata.cpp",
+ "../../include/unrar/consio.cpp",
+ "../../include/unrar/crc.cpp",
+ "../../include/unrar/crypt.cpp",
+ "../../include/unrar/encname.cpp",
+ "../../include/unrar/errhnd.cpp",
+ "../../include/unrar/extinfo.cpp",
+ "../../include/unrar/extract.cpp",
+ "../../include/unrar/filcreat.cpp",
+ "../../include/unrar/file.cpp",
+ "../../include/unrar/filefn.cpp",
+ "../../include/unrar/filestr.cpp",
+ "../../include/unrar/find.cpp",
+ "../../include/unrar/getbits.cpp",
+ "../../include/unrar/global.cpp",
+ "../../include/unrar/hash.cpp",
+ "../../include/unrar/headers.cpp",
+ "../../include/unrar/isnt.cpp",
+ "../../include/unrar/list.cpp",
+ "../../include/unrar/match.cpp",
+ "../../include/unrar/options.cpp",
+ "../../include/unrar/pathfn.cpp",
+ "../../include/unrar/qopen.cpp",
+ "../../include/unrar/rar.cpp",
+ "../../include/unrar/rarpch.cpp",
+ "../../include/unrar/rarvm.cpp",
+ "../../include/unrar/rawread.cpp",
+ "../../include/unrar/rdwrfn.cpp",
+ "../../include/unrar/recvol.cpp",
+ "../../include/unrar/resource.cpp",
+ "../../include/unrar/rijndael.cpp",
+ "../../include/unrar/rs.cpp",
+ "../../include/unrar/rs16.cpp",
+ "../../include/unrar/scantree.cpp",
+ "../../include/unrar/secpassword.cpp",
+ "../../include/unrar/sha1.cpp",
+ "../../include/unrar/sha256.cpp",
+ "../../include/unrar/smallfn.cpp",
+ "../../include/unrar/strfn.cpp",
+ "../../include/unrar/strlist.cpp",
+ "../../include/unrar/system.cpp",
+ "../../include/unrar/threadpool.cpp",
+ "../../include/unrar/timefn.cpp",
+ "../../include/unrar/ui.cpp",
+ "../../include/unrar/unicode.cpp",
+ "../../include/unrar/unpack.cpp",
+ "../../include/unrar/volume.cpp",
+ }
+ files {
+ "../../include/unrar/archive.hpp",
+ "../../include/unrar/array.hpp",
+ "../../include/unrar/blake2s.hpp",
+ "../../include/unrar/cmddata.hpp",
+ "../../include/unrar/coder.hpp",
+ "../../include/unrar/compress.hpp",
+ "../../include/unrar/consio.hpp",
+ "../../include/unrar/crc.hpp",
+ "../../include/unrar/crypt.hpp",
+ "../../include/unrar/dll.hpp",
+ "../../include/unrar/encname.hpp",
+ "../../include/unrar/errhnd.hpp",
+ "../../include/unrar/extinfo.hpp",
+ "../../include/unrar/extract.hpp",
+ "../../include/unrar/filcreat.hpp",
+ "../../include/unrar/file.hpp",
+ "../../include/unrar/filefn.hpp",
+ "../../include/unrar/filestr.hpp",
+ "../../include/unrar/find.hpp",
+ "../../include/unrar/getbits.hpp",
+ "../../include/unrar/global.hpp",
+ "../../include/unrar/hash.hpp",
+ "../../include/unrar/headers.hpp",
+ "../../include/unrar/headers5.hpp",
+ "../../include/unrar/isnt.hpp",
+ "../../include/unrar/list.hpp",
+ "../../include/unrar/loclang.hpp",
+ "../../include/unrar/log.hpp",
+ "../../include/unrar/match.hpp",
+ "../../include/unrar/model.hpp",
+ "../../include/unrar/openmpt.hpp",
+ "../../include/unrar/openmpt-callback.hpp",
+ "../../include/unrar/options.hpp",
+ "../../include/unrar/os.hpp",
+ "../../include/unrar/pathfn.hpp",
+ "../../include/unrar/qopen.hpp",
+ "../../include/unrar/rar.hpp",
+ "../../include/unrar/rardefs.hpp",
+ "../../include/unrar/rarlang.hpp",
+ "../../include/unrar/raros.hpp",
+ "../../include/unrar/rartypes.hpp",
+ "../../include/unrar/rarvm.hpp",
+ "../../include/unrar/rawread.hpp",
+ "../../include/unrar/rdwrfn.hpp",
+ "../../include/unrar/recvol.hpp",
+ "../../include/unrar/resource.hpp",
+ "../../include/unrar/rijndael.hpp",
+ "../../include/unrar/rs.hpp",
+ "../../include/unrar/rs16.hpp",
+ "../../include/unrar/savepos.hpp",
+ "../../include/unrar/scantree.hpp",
+ "../../include/unrar/secpassword.hpp",
+ "../../include/unrar/sha1.hpp",
+ "../../include/unrar/sha256.hpp",
+ "../../include/unrar/smallfn.hpp",
+ "../../include/unrar/strfn.hpp",
+ "../../include/unrar/strlist.hpp",
+ "../../include/unrar/suballoc.hpp",
+ "../../include/unrar/system.hpp",
+ "../../include/unrar/threadpool.hpp",
+ "../../include/unrar/timefn.hpp",
+ "../../include/unrar/ulinks.hpp",
+ "../../include/unrar/ui.hpp",
+ "../../include/unrar/unicode.hpp",
+ "../../include/unrar/unpack.hpp",
+ "../../include/unrar/version.hpp",
+ "../../include/unrar/volume.hpp",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua (from rev 4975, trunk/OpenMPT/include/flac.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,79 @@
+
+ project "flac"
+ uuid "E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/flac"
+ includedirs { "../../include/flac/include", "../../include/flac/src/libFLAC/include" }
+ files {
+ "../../include/flac/src/libFLAC/bitmath.c",
+ "../../include/flac/src/libFLAC/bitreader.c",
+ "../../include/flac/src/libFLAC/bitwriter.c",
+ "../../include/flac/src/libFLAC/cpu.c",
+ "../../include/flac/src/libFLAC/crc.c",
+ "../../include/flac/src/libFLAC/fixed.c",
+ "../../include/flac/src/libFLAC/fixed_intrin_sse2.c",
+ "../../include/flac/src/libFLAC/fixed_intrin_ssse3.c",
+ "../../include/flac/src/libFLAC/float.c",
+ "../../include/flac/src/libFLAC/format.c",
+ "../../include/flac/src/libFLAC/lpc.c",
+ "../../include/flac/src/libFLAC/lpc_intrin_avx2.c",
+ "../../include/flac/src/libFLAC/lpc_intrin_sse2.c",
+ "../../include/flac/src/libFLAC/lpc_intrin_sse41.c",
+ "../../include/flac/src/libFLAC/lpc_intrin_sse.c",
+ "../../include/flac/src/libFLAC/md5.c",
+ "../../include/flac/src/libFLAC/memory.c",
+ "../../include/flac/src/libFLAC/metadata_iterators.c",
+ "../../include/flac/src/libFLAC/metadata_object.c",
+ "../../include/flac/src/libFLAC/stream_decoder.c",
+ "../../include/flac/src/libFLAC/stream_encoder.c",
+ "../../include/flac/src/libFLAC/stream_encoder_intrin_avx2.c",
+ "../../include/flac/src/libFLAC/stream_encoder_intrin_sse2.c",
+ "../../include/flac/src/libFLAC/stream_encoder_intrin_ssse3.c",
+ "../../include/flac/src/libFLAC/stream_encoder_framing.c",
+ "../../include/flac/src/libFLAC/window.c",
+ }
+ files {
+ "../../include/flac/src/share/win_utf8_io/win_utf8_io.c",
+ }
+ files {
+ "../../include/flac/src/libFLAC/include/private/all.h",
+ "../../include/flac/src/libFLAC/include/private/bitmath.h",
+ "../../include/flac/src/libFLAC/include/private/bitreader.h",
+ "../../include/flac/src/libFLAC/include/private/bitwriter.h",
+ "../../include/flac/src/libFLAC/include/private/cpu.h",
+ "../../include/flac/src/libFLAC/include/private/crc.h",
+ "../../include/flac/src/libFLAC/include/private/fixed.h",
+ "../../include/flac/src/libFLAC/include/private/float.h",
+ "../../include/flac/src/libFLAC/include/private/format.h",
+ "../../include/flac/src/libFLAC/include/private/lpc.h",
+ "../../include/flac/src/libFLAC/include/private/md5.h",
+ "../../include/flac/src/libFLAC/include/private/memory.h",
+ "../../include/flac/src/libFLAC/include/private/metadata.h",
+ "../../include/flac/src/libFLAC/include/private/stream_encoder.h",
+ "../../include/flac/src/libFLAC/include/private/stream_encoder_framing.h",
+ "../../include/flac/src/libFLAC/include/private/window.h",
+ "../../include/flac/src/libFLAC/include/protected/all.h",
+ "../../include/flac/src/libFLAC/include/protected/stream_decoder.h",
+ "../../include/flac/src/libFLAC/include/protected/stream_encoder.h",
+ }
+ files {
+ "../../include/flac/include/FLAC/all.h",
+ "../../include/flac/include/FLAC/assert.h",
+ "../../include/flac/include/FLAC/callback.h",
+ "../../include/flac/include/FLAC/export.h",
+ "../../include/flac/include/FLAC/format.h",
+ "../../include/flac/include/FLAC/metadata.h",
+ "../../include/flac/include/FLAC/ordinals.h",
+ "../../include/flac/include/FLAC/stream_decoder.h",
+ "../../include/flac/include/FLAC/stream_encoder.h",
+ }
+ buildoptions { "/wd4244", "/wd4267", "/wd4334" }
+ configuration "*Lib"
+ defines { "FLAC__NO_DLL" }
+ configuration "vs2010"
+ defines { "VERSION=\"1.3.1\"" }
+ configuration "vs2008"
+ defines { "VERSION=\\\"1.3.1\\\"" }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua (from rev 4975, trunk/OpenMPT/include/lhasa.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,51 @@
+
+ project "lhasa"
+ uuid "6B11F6A8-B131-4D2B-80EF-5731A9016436"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/lhasa"
+ includedirs { "../../include/msinttypes/inttypes" }
+ files {
+ "../../include/lhasa/lib/crc16.c",
+ "../../include/lhasa/lib/ext_header.c",
+ "../../include/lhasa/lib/lh1_decoder.c",
+ "../../include/lhasa/lib/lh5_decoder.c",
+ "../../include/lhasa/lib/lh6_decoder.c",
+ "../../include/lhasa/lib/lh7_decoder.c",
+ "../../include/lhasa/lib/lha_arch_unix.c",
+ "../../include/lhasa/lib/lha_arch_win32.c",
+ "../../include/lhasa/lib/lha_basic_reader.c",
+ "../../include/lhasa/lib/lha_decoder.c",
+ "../../include/lhasa/lib/lha_endian.c",
+ "../../include/lhasa/lib/lha_file_header.c",
+ "../../include/lhasa/lib/lha_input_stream.c",
+ "../../include/lhasa/lib/lha_reader.c",
+ "../../include/lhasa/lib/lhx_decoder.c",
+ "../../include/lhasa/lib/lz5_decoder.c",
+ "../../include/lhasa/lib/lzs_decoder.c",
+ "../../include/lhasa/lib/macbinary.c",
+ "../../include/lhasa/lib/null_decoder.c",
+ "../../include/lhasa/lib/pm1_decoder.c",
+ "../../include/lhasa/lib/pm2_decoder.c",
+ }
+ files {
+ "../../include/lhasa/lib/crc16.h",
+ "../../include/lhasa/lib/ext_header.h",
+ "../../include/lhasa/lib/lha_arch.h",
+ "../../include/lhasa/lib/lha_basic_reader.h",
+ "../../include/lhasa/lib/lha_decoder.h",
+ "../../include/lhasa/lib/lha_endian.h",
+ "../../include/lhasa/lib/lha_file_header.h",
+ "../../include/lhasa/lib/lha_input_stream.h",
+ "../../include/lhasa/lib/macbinary.h",
+ "../../include/lhasa/lib/public/lha_decoder.h",
+ "../../include/lhasa/lib/public/lha_file_header.h",
+ "../../include/lhasa/lib/public/lha_input_stream.h",
+ "../../include/lhasa/lib/public/lha_reader.h",
+ "../../include/lhasa/lib/public/lhasa.h",
+ }
+ buildoptions { "/wd4244", "/wd4267" }
+ configuration "vs2008"
+ includedirs { "../../include/msinttypes/stdint" }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua (from rev 4975, trunk/OpenMPT/include/miniz.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,11 @@
+
+ project "miniz"
+ uuid "B5E0C06B-8121-426A-8FFB-4293ECAAE29C"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/miniz"
+ files {
+ "../../include/miniz/miniz.c",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua (from rev 4975, trunk/OpenMPT/include/minizip.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,24 @@
+
+ project "minizip"
+ uuid "63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/minizip"
+ includedirs { "../../include/zlib", "../../include/zlib/contrib/minizip" }
+ files {
+ "../../include/zlib/contrib/minizip/ioapi.c",
+ "../../include/zlib/contrib/minizip/iowin32.c",
+ "../../include/zlib/contrib/minizip/mztools.c",
+ "../../include/zlib/contrib/minizip/unzip.c",
+ "../../include/zlib/contrib/minizip/zip.c",
+ }
+ files {
+ "../../include/zlib/contrib/minizip/crypt.h",
+ "../../include/zlib/contrib/minizip/ioapi.h",
+ "../../include/zlib/contrib/minizip/iowin32.h",
+ "../../include/zlib/contrib/minizip/mztools.h",
+ "../../include/zlib/contrib/minizip/unzip.h",
+ "../../include/zlib/contrib/minizip/zip.h",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua (from rev 4975, trunk/OpenMPT/include/portaudio.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,75 @@
+
+ project "portaudio"
+ uuid "189B867F-FF4B-45A1-B741-A97492EE69AF"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/portaudio"
+ includedirs { "../../include/portaudio/include", "../../include/portaudio/src/common", "../../include/portaudio/src/os/win" }
+ defines {
+ "PAWIN_USE_WDMKS_DEVICE_INFO",
+ "PA_WDMKS_NO_KSGUID_LIB",
+ "PA_USE_ASIO=0",
+ "PA_USE_DS=1",
+ "PA_USE_WMME=1",
+ "PA_USE_WASAPI=1",
+ "PA_USE_WDMKS=1",
+ }
+ files {
+ "../../include/portaudio/src/common/pa_allocation.c",
+ "../../include/portaudio/src/common/pa_allocation.h",
+ "../../include/portaudio/src/common/pa_converters.c",
+ "../../include/portaudio/src/common/pa_converters.h",
+ "../../include/portaudio/src/common/pa_cpuload.c",
+ "../../include/portaudio/src/common/pa_cpuload.h",
+ "../../include/portaudio/src/common/pa_debugprint.c",
+ "../../include/portaudio/src/common/pa_debugprint.h",
+ "../../include/portaudio/src/common/pa_dither.c",
+ "../../include/portaudio/src/common/pa_dither.h",
+ "../../include/portaudio/src/common/pa_endianness.h",
+ "../../include/portaudio/src/common/pa_front.c",
+ "../../include/portaudio/src/common/pa_hostapi.h",
+ "../../include/portaudio/src/common/pa_memorybarrier.h",
+ "../../include/portaudio/src/common/pa_process.c",
+ "../../include/portaudio/src/common/pa_process.h",
+ "../../include/portaudio/src/common/pa_ringbuffer.c",
+ "../../include/portaudio/src/common/pa_ringbuffer.h",
+ "../../include/portaudio/src/common/pa_stream.c",
+ "../../include/portaudio/src/common/pa_stream.h",
+ "../../include/portaudio/src/common/pa_trace.c",
+ "../../include/portaudio/src/common/pa_trace.h",
+ "../../include/portaudio/src/common/pa_types.h",
+ "../../include/portaudio/src/common/pa_util.h",
+ "../../include/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
+ "../../include/portaudio/src/hostapi/dsound/pa_win_ds.c",
+ "../../include/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
+ "../../include/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h",
+ "../../include/portaudio/src/hostapi/wasapi/pa_win_wasapi.c",
+ "../../include/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
+ "../../include/portaudio/src/hostapi/wmme/pa_win_wmme.c",
+ "../../include/portaudio/src/os/win/pa_win_coinitialize.c",
+ "../../include/portaudio/src/os/win/pa_win_coinitialize.h",
+ "../../include/portaudio/src/os/win/pa_win_hostapis.c",
+ "../../include/portaudio/src/os/win/pa_win_util.c",
+ "../../include/portaudio/src/os/win/pa_win_waveformat.c",
+ "../../include/portaudio/src/os/win/pa_win_wdmks_utils.c",
+ "../../include/portaudio/src/os/win/pa_win_wdmks_utils.h",
+ "../../include/portaudio/src/os/win/pa_x86_plain_converters.c",
+ "../../include/portaudio/src/os/win/pa_x86_plain_converters.h",
+ }
+ files {
+ "../../include/portaudio/include/pa_asio.h",
+ "../../include/portaudio/include/pa_jack.h",
+ "../../include/portaudio/include/pa_linux_alsa.h",
+ "../../include/portaudio/include/pa_mac_core.h",
+ "../../include/portaudio/include/pa_win_ds.h",
+ "../../include/portaudio/include/pa_win_wasapi.h",
+ "../../include/portaudio/include/pa_win_waveformat.h",
+ "../../include/portaudio/include/pa_win_wdmks.h",
+ "../../include/portaudio/include/pa_win_wmme.h",
+ "../../include/portaudio/include/portaudio.h",
+ }
+ buildoptions { "/wd4018", "/wd4267" }
+ configuration "Debug*"
+ defines { "PA_ENABLE_DEBUG_OUTPUT" }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua (from rev 4975, trunk/OpenMPT/include/portmidi.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,24 @@
+
+ project "portmidi"
+ uuid "2512E2CA-578A-4F10-9363-4BFC9A5EF960"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/portmidi"
+ includedirs { "../../include/portmidi/porttime", "../../include/portmidi/pm_common", "../../include/portmidi/pm_win" }
+ files {
+ "../../include/portmidi/porttime/porttime.c",
+ "../../include/portmidi/porttime/ptwinmm.c",
+ "../../include/portmidi/pm_common/pmutil.c",
+ "../../include/portmidi/pm_common/portmidi.c",
+ "../../include/portmidi/pm_win/pmwin.c",
+ "../../include/portmidi/pm_win/pmwinmm.c",
+ }
+ files {
+ "../../include/portmidi/porttime/porttime.h",
+ "../../include/portmidi/pm_common/pminternal.h",
+ "../../include/portmidi/pm_common/pmutil.h",
+ "../../include/portmidi/pm_common/portmidi.h",
+ "../../include/portmidi/pm_win/pmwinmm.h",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua (from rev 4975, trunk/OpenMPT/include/pugixml.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,16 @@
+
+ project "pugixml"
+ uuid "07B89124-7C71-42cc-81AB-62B09BB61F9B"
+ language "C++"
+ location "../../build/gen"
+ objdir "../../build/obj/pugixml"
+ includedirs { }
+ files {
+ "../../include/pugixml/src/pugixml.cpp",
+ }
+ files {
+ "../../include/pugixml/src/pugiconfig.hpp",
+ "../../include/pugixml/src/pugixml.hpp",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua (from rev 4975, trunk/OpenMPT/include/r8brain.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,26 @@
+
+ project "r8brain"
+ uuid "BC116B29-9958-4389-B294-7529BB7C7D37"
+ language "C++"
+ location "../../build/gen"
+ objdir "../../build/obj/r8brain"
+ includedirs { "../../include/r8brain" }
+ files {
+ "../../include/r8brain/r8bbase.cpp",
+ }
+ files {
+ "../../include/r8brain/CDSPBlockConvolver.h",
+ "../../include/r8brain/CDSPFIRFilter.h",
+ "../../include/r8brain/CDSPFracInterpolator.h",
+ "../../include/r8brain/CDSPProcessor.h",
+ "../../include/r8brain/CDSPRealFFT.h",
+ "../../include/r8brain/CDSPResampler.h",
+ "../../include/r8brain/CDSPSincFilterGen.h",
+ "../../include/r8brain/fft4g.h",
+ "../../include/r8brain/r8bbase.h",
+ "../../include/r8brain/r8bconf.h",
+ "../../include/r8brain/r8butil.h",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
+
\ No newline at end of file
Copied: trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua (from rev 4975, trunk/OpenMPT/include/smbPitchShift.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,15 @@
+
+ project "smbPitchShift"
+ uuid "89AF16DD-32CC-4A7E-B219-5F117D761F9F"
+ language "C++"
+ location "../../build/gen"
+ objdir "../../build/obj/smbPitchShift"
+ includedirs { }
+ files {
+ "../../include/smbPitchShift/smbPitchShift.cpp",
+ }
+ files {
+ "../../include/smbPitchShift/smbPitchShift.h",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
Copied: trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua (from rev 4975, trunk/OpenMPT/include/soundtouch.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,50 @@
+
+ project "soundtouch"
+ uuid "F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD"
+ language "C++"
+ location "../../build/gen"
+ objdir "../../build/obj/soundtouch"
+ targetname "OpenMPT_SoundTouch_f32"
+ includedirs { "../../include/soundtouch/include" }
+ files {
+ "../../include/soundtouch/include/BPMDetect.h",
+ "../../include/soundtouch/include/FIFOSampleBuffer.h",
+ "../../include/soundtouch/include/FIFOSamplePipe.h",
+ "../../include/soundtouch/include/SoundTouch.h",
+ "../../include/soundtouch/include/STTypes.h",
+ }
+ files {
+ "../../include/soundtouch/source/SoundTouch/AAFilter.cpp",
+ "../../include/soundtouch/source/SoundTouch/BPMDetect.cpp",
+ "../../include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp",
+ "../../include/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp",
+ "../../include/soundtouch/source/SoundTouch/FIRFilter.cpp",
+ "../../include/soundtouch/source/SoundTouch/InterpolateCubic.cpp",
+ "../../include/soundtouch/source/SoundTouch/InterpolateLinear.cpp",
+ "../../include/soundtouch/source/SoundTouch/InterpolateShannon.cpp",
+ "../../include/soundtouch/source/SoundTouch/mmx_optimized.cpp",
+ "../../include/soundtouch/source/SoundTouch/PeakFinder.cpp",
+ "../../include/soundtouch/source/SoundTouch/RateTransposer.cpp",
+ "../../include/soundtouch/source/SoundTouch/SoundTouch.cpp",
+ "../../include/soundtouch/source/SoundTouch/sse_optimized.cpp",
+ "../../include/soundtouch/source/SoundTouch/TDStretch.cpp",
+ }
+ files {
+ "../../include/soundtouch/source/SoundTouch/AAFilter.h",
+ "../../include/soundtouch/source/SoundTouch/cpu_detect.h",
+ "../../include/soundtouch/source/SoundTouch/FIRFilter.h",
+ "../../include/soundtouch/source/SoundTouch/InterpolateCubic.h",
+ "../../include/soundtouch/source/SoundTouch/InterpolateLinear.h",
+ "../../include/soundtouch/source/SoundTouch/InterpolateShannon.h",
+ "../../include/soundtouch/source/SoundTouch/PeakFinder.h",
+ "../../include/soundtouch/source/SoundTouch/RateTransposer.h",
+ "../../include/soundtouch/source/SoundTouch/TDStretch.h",
+ }
+ files {
+ "../../include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp",
+ "../../include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.h",
+ }
+ defines { "DLL_EXPORTS" }
+ dofile "../../build/premake4-defaults-DLL.lua"
+ dofile "../../build/premake4-defaults-static.lua"
+
\ No newline at end of file
Copied: trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua (from rev 4975, trunk/OpenMPT/include/zlib.premake4.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -0,0 +1,40 @@
+
+ project "zlib"
+ uuid "1654FB18-FDE6-406F-9D84-BA12BFBD67B2"
+ language "C"
+ location "../../build/gen"
+ objdir "../../build/obj/zlib"
+ includedirs { "../../include/zlib" }
+ files {
+ "../../include/zlib/adler32.c",
+ "../../include/zlib/compress.c",
+ "../../include/zlib/crc32.c",
+ "../../include/zlib/deflate.c",
+ "../../include/zlib/gzclose.c",
+ "../../include/zlib/gzlib.c",
+ "../../include/zlib/gzread.c",
+ "../../include/zlib/gzwrite.c",
+ "../../include/zlib/infback.c",
+ "../../include/zlib/inffast.c",
+ "../../include/zlib/inflate.c",
+ "../../include/zlib/inftrees.c",
+ "../../include/zlib/trees.c",
+ "../../include/zlib/uncompr.c",
+ "../../include/zlib/zutil.c",
+ }
+ files {
+ "../../include/zlib/crc32.h",
+ "../../include/zlib/deflate.h",
+ "../../include/zlib/gzguts.h",
+ "../../include/zlib/inffast.h",
+ "../../include/zlib/inffixed.h",
+ "../../include/zlib/inflate.h",
+ "../../include/zlib/inftrees.h",
+ "../../include/zlib/trees.h",
+ "../../include/zlib/zconf.h",
+ "../../include/zlib/zlib.h",
+ "../../include/zlib/zutil.h",
+ }
+ dofile "../../build/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-defaults-static.lua"
+
\ No newline at end of file
Modified: trunk/OpenMPT/build/premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/build/premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -3,15 +3,15 @@
configurations { "Debug", "Release", "ReleaseNoLTCG" }
platforms { "x32", "x64" }
- dofile "../include/flac.premake4.lua"
- dofile "../include/lhasa.premake4.lua"
- dofile "../include/miniz.premake4.lua"
- dofile "../include/minizip.premake4.lua"
- dofile "../include/portaudio.premake4.lua"
- dofile "../include/portmidi.premake4.lua"
- dofile "../include/pugixml.premake4.lua"
- dofile "../include/r8brain.premake4.lua"
- dofile "../include/smbPitchShift.premake4.lua"
- dofile "../include/soundtouch.premake4.lua"
- dofile "../include/UnRAR.premake4.lua"
- dofile "../include/zlib.premake4.lua"
+ dofile "../build/premake4-win/ext-flac.premake4.lua"
+ dofile "../build/premake4-win/ext-lhasa.premake4.lua"
+ dofile "../build/premake4-win/ext-miniz.premake4.lua"
+ dofile "../build/premake4-win/ext-minizip.premake4.lua"
+ dofile "../build/premake4-win/ext-portaudio.premake4.lua"
+ dofile "../build/premake4-win/ext-portmidi.premake4.lua"
+ dofile "../build/premake4-win/ext-pugixml.premake4.lua"
+ dofile "../build/premake4-win/ext-r8brain.premake4.lua"
+ dofile "../build/premake4-win/ext-smbPitchShift.premake4.lua"
+ dofile "../build/premake4-win/ext-soundtouch.premake4.lua"
+ dofile "../build/premake4-win/ext-UnRAR.premake4.lua"
+ dofile "../build/premake4-win/ext-zlib.premake4.lua"
Deleted: trunk/OpenMPT/include/UnRAR.premake4.lua
===================================================================
--- trunk/OpenMPT/include/UnRAR.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/UnRAR.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,130 +0,0 @@
-
- project "UnRAR"
- uuid "95CC809B-03FC-4EDB-BB20-FD07A698C05F"
- language "C++"
- location "../build/gen"
- objdir "../build/obj/unrar"
- includedirs { "../include/unrar" }
- files {
- "../include/unrar/archive.cpp",
- "../include/unrar/arcread.cpp",
- "../include/unrar/blake2s.cpp",
- "../include/unrar/cmddata.cpp",
- "../include/unrar/consio.cpp",
- "../include/unrar/crc.cpp",
- "../include/unrar/crypt.cpp",
- "../include/unrar/encname.cpp",
- "../include/unrar/errhnd.cpp",
- "../include/unrar/extinfo.cpp",
- "../include/unrar/extract.cpp",
- "../include/unrar/filcreat.cpp",
- "../include/unrar/file.cpp",
- "../include/unrar/filefn.cpp",
- "../include/unrar/filestr.cpp",
- "../include/unrar/find.cpp",
- "../include/unrar/getbits.cpp",
- "../include/unrar/global.cpp",
- "../include/unrar/hash.cpp",
- "../include/unrar/headers.cpp",
- "../include/unrar/isnt.cpp",
- "../include/unrar/list.cpp",
- "../include/unrar/match.cpp",
- "../include/unrar/options.cpp",
- "../include/unrar/pathfn.cpp",
- "../include/unrar/qopen.cpp",
- "../include/unrar/rar.cpp",
- "../include/unrar/rarpch.cpp",
- "../include/unrar/rarvm.cpp",
- "../include/unrar/rawread.cpp",
- "../include/unrar/rdwrfn.cpp",
- "../include/unrar/recvol.cpp",
- "../include/unrar/resource.cpp",
- "../include/unrar/rijndael.cpp",
- "../include/unrar/rs.cpp",
- "../include/unrar/rs16.cpp",
- "../include/unrar/scantree.cpp",
- "../include/unrar/secpassword.cpp",
- "../include/unrar/sha1.cpp",
- "../include/unrar/sha256.cpp",
- "../include/unrar/smallfn.cpp",
- "../include/unrar/strfn.cpp",
- "../include/unrar/strlist.cpp",
- "../include/unrar/system.cpp",
- "../include/unrar/threadpool.cpp",
- "../include/unrar/timefn.cpp",
- "../include/unrar/ui.cpp",
- "../include/unrar/unicode.cpp",
- "../include/unrar/unpack.cpp",
- "../include/unrar/volume.cpp",
- }
- files {
- "../include/unrar/archive.hpp",
- "../include/unrar/array.hpp",
- "../include/unrar/blake2s.hpp",
- "../include/unrar/cmddata.hpp",
- "../include/unrar/coder.hpp",
- "../include/unrar/compress.hpp",
- "../include/unrar/consio.hpp",
- "../include/unrar/crc.hpp",
- "../include/unrar/crypt.hpp",
- "../include/unrar/dll.hpp",
- "../include/unrar/encname.hpp",
- "../include/unrar/errhnd.hpp",
- "../include/unrar/extinfo.hpp",
- "../include/unrar/extract.hpp",
- "../include/unrar/filcreat.hpp",
- "../include/unrar/file.hpp",
- "../include/unrar/filefn.hpp",
- "../include/unrar/filestr.hpp",
- "../include/unrar/find.hpp",
- "../include/unrar/getbits.hpp",
- "../include/unrar/global.hpp",
- "../include/unrar/hash.hpp",
- "../include/unrar/headers.hpp",
- "../include/unrar/headers5.hpp",
- "../include/unrar/isnt.hpp",
- "../include/unrar/list.hpp",
- "../include/unrar/loclang.hpp",
- "../include/unrar/log.hpp",
- "../include/unrar/match.hpp",
- "../include/unrar/model.hpp",
- "../include/unrar/openmpt.hpp",
- "../include/unrar/openmpt-callback.hpp",
- "../include/unrar/options.hpp",
- "../include/unrar/os.hpp",
- "../include/unrar/pathfn.hpp",
- "../include/unrar/qopen.hpp",
- "../include/unrar/rar.hpp",
- "../include/unrar/rardefs.hpp",
- "../include/unrar/rarlang.hpp",
- "../include/unrar/raros.hpp",
- "../include/unrar/rartypes.hpp",
- "../include/unrar/rarvm.hpp",
- "../include/unrar/rawread.hpp",
- "../include/unrar/rdwrfn.hpp",
- "../include/unrar/recvol.hpp",
- "../include/unrar/resource.hpp",
- "../include/unrar/rijndael.hpp",
- "../include/unrar/rs.hpp",
- "../include/unrar/rs16.hpp",
- "../include/unrar/savepos.hpp",
- "../include/unrar/scantree.hpp",
- "../include/unrar/secpassword.hpp",
- "../include/unrar/sha1.hpp",
- "../include/unrar/sha256.hpp",
- "../include/unrar/smallfn.hpp",
- "../include/unrar/strfn.hpp",
- "../include/unrar/strlist.hpp",
- "../include/unrar/suballoc.hpp",
- "../include/unrar/system.hpp",
- "../include/unrar/threadpool.hpp",
- "../include/unrar/timefn.hpp",
- "../include/unrar/ulinks.hpp",
- "../include/unrar/ui.hpp",
- "../include/unrar/unicode.hpp",
- "../include/unrar/unpack.hpp",
- "../include/unrar/version.hpp",
- "../include/unrar/volume.hpp",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/flac.premake4.lua
===================================================================
--- trunk/OpenMPT/include/flac.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/flac.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,79 +0,0 @@
-
- project "flac"
- uuid "E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5"
- language "C"
- location "../build/gen"
- objdir "../build/obj/flac"
- includedirs { "../include/flac/include", "../include/flac/src/libFLAC/include" }
- files {
- "../include/flac/src/libFLAC/bitmath.c",
- "../include/flac/src/libFLAC/bitreader.c",
- "../include/flac/src/libFLAC/bitwriter.c",
- "../include/flac/src/libFLAC/cpu.c",
- "../include/flac/src/libFLAC/crc.c",
- "../include/flac/src/libFLAC/fixed.c",
- "../include/flac/src/libFLAC/fixed_intrin_sse2.c",
- "../include/flac/src/libFLAC/fixed_intrin_ssse3.c",
- "../include/flac/src/libFLAC/float.c",
- "../include/flac/src/libFLAC/format.c",
- "../include/flac/src/libFLAC/lpc.c",
- "../include/flac/src/libFLAC/lpc_intrin_avx2.c",
- "../include/flac/src/libFLAC/lpc_intrin_sse2.c",
- "../include/flac/src/libFLAC/lpc_intrin_sse41.c",
- "../include/flac/src/libFLAC/lpc_intrin_sse.c",
- "../include/flac/src/libFLAC/md5.c",
- "../include/flac/src/libFLAC/memory.c",
- "../include/flac/src/libFLAC/metadata_iterators.c",
- "../include/flac/src/libFLAC/metadata_object.c",
- "../include/flac/src/libFLAC/stream_decoder.c",
- "../include/flac/src/libFLAC/stream_encoder.c",
- "../include/flac/src/libFLAC/stream_encoder_intrin_avx2.c",
- "../include/flac/src/libFLAC/stream_encoder_intrin_sse2.c",
- "../include/flac/src/libFLAC/stream_encoder_intrin_ssse3.c",
- "../include/flac/src/libFLAC/stream_encoder_framing.c",
- "../include/flac/src/libFLAC/window.c",
- }
- files {
- "../include/flac/src/share/win_utf8_io/win_utf8_io.c",
- }
- files {
- "../include/flac/src/libFLAC/include/private/all.h",
- "../include/flac/src/libFLAC/include/private/bitmath.h",
- "../include/flac/src/libFLAC/include/private/bitreader.h",
- "../include/flac/src/libFLAC/include/private/bitwriter.h",
- "../include/flac/src/libFLAC/include/private/cpu.h",
- "../include/flac/src/libFLAC/include/private/crc.h",
- "../include/flac/src/libFLAC/include/private/fixed.h",
- "../include/flac/src/libFLAC/include/private/float.h",
- "../include/flac/src/libFLAC/include/private/format.h",
- "../include/flac/src/libFLAC/include/private/lpc.h",
- "../include/flac/src/libFLAC/include/private/md5.h",
- "../include/flac/src/libFLAC/include/private/memory.h",
- "../include/flac/src/libFLAC/include/private/metadata.h",
- "../include/flac/src/libFLAC/include/private/stream_encoder.h",
- "../include/flac/src/libFLAC/include/private/stream_encoder_framing.h",
- "../include/flac/src/libFLAC/include/private/window.h",
- "../include/flac/src/libFLAC/include/protected/all.h",
- "../include/flac/src/libFLAC/include/protected/stream_decoder.h",
- "../include/flac/src/libFLAC/include/protected/stream_encoder.h",
- }
- files {
- "../include/flac/include/FLAC/all.h",
- "../include/flac/include/FLAC/assert.h",
- "../include/flac/include/FLAC/callback.h",
- "../include/flac/include/FLAC/export.h",
- "../include/flac/include/FLAC/format.h",
- "../include/flac/include/FLAC/metadata.h",
- "../include/flac/include/FLAC/ordinals.h",
- "../include/flac/include/FLAC/stream_decoder.h",
- "../include/flac/include/FLAC/stream_encoder.h",
- }
- buildoptions { "/wd4244", "/wd4267", "/wd4334" }
- configuration "*Lib"
- defines { "FLAC__NO_DLL" }
- configuration "vs2010"
- defines { "VERSION=\"1.3.1\"" }
- configuration "vs2008"
- defines { "VERSION=\\\"1.3.1\\\"" }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/lhasa.premake4.lua
===================================================================
--- trunk/OpenMPT/include/lhasa.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/lhasa.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,51 +0,0 @@
-
- project "lhasa"
- uuid "6B11F6A8-B131-4D2B-80EF-5731A9016436"
- language "C"
- location "../build/gen"
- objdir "../build/obj/lhasa"
- includedirs { "../include/msinttypes/inttypes" }
- files {
- "../include/lhasa/lib/crc16.c",
- "../include/lhasa/lib/ext_header.c",
- "../include/lhasa/lib/lh1_decoder.c",
- "../include/lhasa/lib/lh5_decoder.c",
- "../include/lhasa/lib/lh6_decoder.c",
- "../include/lhasa/lib/lh7_decoder.c",
- "../include/lhasa/lib/lha_arch_unix.c",
- "../include/lhasa/lib/lha_arch_win32.c",
- "../include/lhasa/lib/lha_basic_reader.c",
- "../include/lhasa/lib/lha_decoder.c",
- "../include/lhasa/lib/lha_endian.c",
- "../include/lhasa/lib/lha_file_header.c",
- "../include/lhasa/lib/lha_input_stream.c",
- "../include/lhasa/lib/lha_reader.c",
- "../include/lhasa/lib/lhx_decoder.c",
- "../include/lhasa/lib/lz5_decoder.c",
- "../include/lhasa/lib/lzs_decoder.c",
- "../include/lhasa/lib/macbinary.c",
- "../include/lhasa/lib/null_decoder.c",
- "../include/lhasa/lib/pm1_decoder.c",
- "../include/lhasa/lib/pm2_decoder.c",
- }
- files {
- "../include/lhasa/lib/crc16.h",
- "../include/lhasa/lib/ext_header.h",
- "../include/lhasa/lib/lha_arch.h",
- "../include/lhasa/lib/lha_basic_reader.h",
- "../include/lhasa/lib/lha_decoder.h",
- "../include/lhasa/lib/lha_endian.h",
- "../include/lhasa/lib/lha_file_header.h",
- "../include/lhasa/lib/lha_input_stream.h",
- "../include/lhasa/lib/macbinary.h",
- "../include/lhasa/lib/public/lha_decoder.h",
- "../include/lhasa/lib/public/lha_file_header.h",
- "../include/lhasa/lib/public/lha_input_stream.h",
- "../include/lhasa/lib/public/lha_reader.h",
- "../include/lhasa/lib/public/lhasa.h",
- }
- buildoptions { "/wd4244", "/wd4267" }
- configuration "vs2008"
- includedirs { "../include/msinttypes/stdint" }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/miniz.premake4.lua
===================================================================
--- trunk/OpenMPT/include/miniz.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/miniz.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,11 +0,0 @@
-
- project "miniz"
- uuid "B5E0C06B-8121-426A-8FFB-4293ECAAE29C"
- language "C"
- location "../build/gen"
- objdir "../build/obj/miniz"
- files {
- "../include/miniz/miniz.c",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/minizip.premake4.lua
===================================================================
--- trunk/OpenMPT/include/minizip.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/minizip.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,24 +0,0 @@
-
- project "minizip"
- uuid "63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7"
- language "C"
- location "../build/gen"
- objdir "../build/obj/minizip"
- includedirs { "../include/zlib", "../include/zlib/contrib/minizip" }
- files {
- "../include/zlib/contrib/minizip/ioapi.c",
- "../include/zlib/contrib/minizip/iowin32.c",
- "../include/zlib/contrib/minizip/mztools.c",
- "../include/zlib/contrib/minizip/unzip.c",
- "../include/zlib/contrib/minizip/zip.c",
- }
- files {
- "../include/zlib/contrib/minizip/crypt.h",
- "../include/zlib/contrib/minizip/ioapi.h",
- "../include/zlib/contrib/minizip/iowin32.h",
- "../include/zlib/contrib/minizip/mztools.h",
- "../include/zlib/contrib/minizip/unzip.h",
- "../include/zlib/contrib/minizip/zip.h",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/portaudio.premake4.lua
===================================================================
--- trunk/OpenMPT/include/portaudio.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/portaudio.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,75 +0,0 @@
-
- project "portaudio"
- uuid "189B867F-FF4B-45A1-B741-A97492EE69AF"
- language "C"
- location "../build/gen"
- objdir "../build/obj/portaudio"
- includedirs { "../include/portaudio/include", "../include/portaudio/src/common", "../include/portaudio/src/os/win" }
- defines {
- "PAWIN_USE_WDMKS_DEVICE_INFO",
- "PA_WDMKS_NO_KSGUID_LIB",
- "PA_USE_ASIO=0",
- "PA_USE_DS=1",
- "PA_USE_WMME=1",
- "PA_USE_WASAPI=1",
- "PA_USE_WDMKS=1",
- }
- files {
- "../include/portaudio/src/common/pa_allocation.c",
- "../include/portaudio/src/common/pa_allocation.h",
- "../include/portaudio/src/common/pa_converters.c",
- "../include/portaudio/src/common/pa_converters.h",
- "../include/portaudio/src/common/pa_cpuload.c",
- "../include/portaudio/src/common/pa_cpuload.h",
- "../include/portaudio/src/common/pa_debugprint.c",
- "../include/portaudio/src/common/pa_debugprint.h",
- "../include/portaudio/src/common/pa_dither.c",
- "../include/portaudio/src/common/pa_dither.h",
- "../include/portaudio/src/common/pa_endianness.h",
- "../include/portaudio/src/common/pa_front.c",
- "../include/portaudio/src/common/pa_hostapi.h",
- "../include/portaudio/src/common/pa_memorybarrier.h",
- "../include/portaudio/src/common/pa_process.c",
- "../include/portaudio/src/common/pa_process.h",
- "../include/portaudio/src/common/pa_ringbuffer.c",
- "../include/portaudio/src/common/pa_ringbuffer.h",
- "../include/portaudio/src/common/pa_stream.c",
- "../include/portaudio/src/common/pa_stream.h",
- "../include/portaudio/src/common/pa_trace.c",
- "../include/portaudio/src/common/pa_trace.h",
- "../include/portaudio/src/common/pa_types.h",
- "../include/portaudio/src/common/pa_util.h",
- "../include/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
- "../include/portaudio/src/hostapi/dsound/pa_win_ds.c",
- "../include/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
- "../include/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h",
- "../include/portaudio/src/hostapi/wasapi/pa_win_wasapi.c",
- "../include/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
- "../include/portaudio/src/hostapi/wmme/pa_win_wmme.c",
- "../include/portaudio/src/os/win/pa_win_coinitialize.c",
- "../include/portaudio/src/os/win/pa_win_coinitialize.h",
- "../include/portaudio/src/os/win/pa_win_hostapis.c",
- "../include/portaudio/src/os/win/pa_win_util.c",
- "../include/portaudio/src/os/win/pa_win_waveformat.c",
- "../include/portaudio/src/os/win/pa_win_wdmks_utils.c",
- "../include/portaudio/src/os/win/pa_win_wdmks_utils.h",
- "../include/portaudio/src/os/win/pa_x86_plain_converters.c",
- "../include/portaudio/src/os/win/pa_x86_plain_converters.h",
- }
- files {
- "../include/portaudio/include/pa_asio.h",
- "../include/portaudio/include/pa_jack.h",
- "../include/portaudio/include/pa_linux_alsa.h",
- "../include/portaudio/include/pa_mac_core.h",
- "../include/portaudio/include/pa_win_ds.h",
- "../include/portaudio/include/pa_win_wasapi.h",
- "../include/portaudio/include/pa_win_waveformat.h",
- "../include/portaudio/include/pa_win_wdmks.h",
- "../include/portaudio/include/pa_win_wmme.h",
- "../include/portaudio/include/portaudio.h",
- }
- buildoptions { "/wd4018", "/wd4267" }
- configuration "Debug*"
- defines { "PA_ENABLE_DEBUG_OUTPUT" }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/portmidi.premake4.lua
===================================================================
--- trunk/OpenMPT/include/portmidi.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/portmidi.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,24 +0,0 @@
-
- project "portmidi"
- uuid "2512E2CA-578A-4F10-9363-4BFC9A5EF960"
- language "C"
- location "../build/gen"
- objdir "../build/obj/portmidi"
- includedirs { "../include/portmidi/porttime", "../include/portmidi/pm_common", "../include/portmidi/pm_win" }
- files {
- "../include/portmidi/porttime/porttime.c",
- "../include/portmidi/porttime/ptwinmm.c",
- "../include/portmidi/pm_common/pmutil.c",
- "../include/portmidi/pm_common/portmidi.c",
- "../include/portmidi/pm_win/pmwin.c",
- "../include/portmidi/pm_win/pmwinmm.c",
- }
- files {
- "../include/portmidi/porttime/porttime.h",
- "../include/portmidi/pm_common/pminternal.h",
- "../include/portmidi/pm_common/pmutil.h",
- "../include/portmidi/pm_common/portmidi.h",
- "../include/portmidi/pm_win/pmwinmm.h",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/pugixml.premake4.lua
===================================================================
--- trunk/OpenMPT/include/pugixml.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/pugixml.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,16 +0,0 @@
-
- project "pugixml"
- uuid "07B89124-7C71-42cc-81AB-62B09BB61F9B"
- language "C++"
- location "../build/gen"
- objdir "../build/obj/pugixml"
- includedirs { }
- files {
- "../include/pugixml/src/pugixml.cpp",
- }
- files {
- "../include/pugixml/src/pugiconfig.hpp",
- "../include/pugixml/src/pugixml.hpp",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/r8brain.premake4.lua
===================================================================
--- trunk/OpenMPT/include/r8brain.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/r8brain.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,26 +0,0 @@
-
- project "r8brain"
- uuid "BC116B29-9958-4389-B294-7529BB7C7D37"
- language "C++"
- location "../build/gen"
- objdir "../build/obj/r8brain"
- includedirs { "../include/r8brain" }
- files {
- "../include/r8brain/r8bbase.cpp",
- }
- files {
- "../include/r8brain/CDSPBlockConvolver.h",
- "../include/r8brain/CDSPFIRFilter.h",
- "../include/r8brain/CDSPFracInterpolator.h",
- "../include/r8brain/CDSPProcessor.h",
- "../include/r8brain/CDSPRealFFT.h",
- "../include/r8brain/CDSPResampler.h",
- "../include/r8brain/CDSPSincFilterGen.h",
- "../include/r8brain/fft4g.h",
- "../include/r8brain/r8bbase.h",
- "../include/r8brain/r8bconf.h",
- "../include/r8brain/r8butil.h",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
-
\ No newline at end of file
Deleted: trunk/OpenMPT/include/smbPitchShift.premake4.lua
===================================================================
--- trunk/OpenMPT/include/smbPitchShift.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/smbPitchShift.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,15 +0,0 @@
-
- project "smbPitchShift"
- uuid "89AF16DD-32CC-4A7E-B219-5F117D761F9F"
- language "C++"
- location "../build/gen"
- objdir "../build/obj/smbPitchShift"
- includedirs { }
- files {
- "../include/smbPitchShift/smbPitchShift.cpp",
- }
- files {
- "../include/smbPitchShift/smbPitchShift.h",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
Deleted: trunk/OpenMPT/include/soundtouch.premake4.lua
===================================================================
--- trunk/OpenMPT/include/soundtouch.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/soundtouch.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,50 +0,0 @@
-
- project "soundtouch"
- uuid "F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD"
- language "C++"
- location "../build/gen"
- objdir "../build/obj/soundtouch"
- targetname "OpenMPT_SoundTouch_f32"
- includedirs { "../include/soundtouch/include" }
- files {
- "../include/soundtouch/include/BPMDetect.h",
- "../include/soundtouch/include/FIFOSampleBuffer.h",
- "../include/soundtouch/include/FIFOSamplePipe.h",
- "../include/soundtouch/include/SoundTouch.h",
- "../include/soundtouch/include/STTypes.h",
- }
- files {
- "../include/soundtouch/source/SoundTouch/AAFilter.cpp",
- "../include/soundtouch/source/SoundTouch/BPMDetect.cpp",
- "../include/soundtouch/source/SoundTouch/cpu_detect_x86.cpp",
- "../include/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp",
- "../include/soundtouch/source/SoundTouch/FIRFilter.cpp",
- "../include/soundtouch/source/SoundTouch/InterpolateCubic.cpp",
- "../include/soundtouch/source/SoundTouch/InterpolateLinear.cpp",
- "../include/soundtouch/source/SoundTouch/InterpolateShannon.cpp",
- "../include/soundtouch/source/SoundTouch/mmx_optimized.cpp",
- "../include/soundtouch/source/SoundTouch/PeakFinder.cpp",
- "../include/soundtouch/source/SoundTouch/RateTransposer.cpp",
- "../include/soundtouch/source/SoundTouch/SoundTouch.cpp",
- "../include/soundtouch/source/SoundTouch/sse_optimized.cpp",
- "../include/soundtouch/source/SoundTouch/TDStretch.cpp",
- }
- files {
- "../include/soundtouch/source/SoundTouch/AAFilter.h",
- "../include/soundtouch/source/SoundTouch/cpu_detect.h",
- "../include/soundtouch/source/SoundTouch/FIRFilter.h",
- "../include/soundtouch/source/SoundTouch/InterpolateCubic.h",
- "../include/soundtouch/source/SoundTouch/InterpolateLinear.h",
- "../include/soundtouch/source/SoundTouch/InterpolateShannon.h",
- "../include/soundtouch/source/SoundTouch/PeakFinder.h",
- "../include/soundtouch/source/SoundTouch/RateTransposer.h",
- "../include/soundtouch/source/SoundTouch/TDStretch.h",
- }
- files {
- "../include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.cpp",
- "../include/soundtouch/source/SoundTouchDLL/SoundTouchDLL.h",
- }
- defines { "DLL_EXPORTS" }
- dofile "../build/premake4-defaults-DLL.lua"
- dofile "../build/premake4-defaults-static.lua"
-
\ No newline at end of file
Deleted: trunk/OpenMPT/include/zlib.premake4.lua
===================================================================
--- trunk/OpenMPT/include/zlib.premake4.lua 2015-04-23 19:20:43 UTC (rev 4976)
+++ trunk/OpenMPT/include/zlib.premake4.lua 2015-04-23 19:42:21 UTC (rev 4977)
@@ -1,40 +0,0 @@
-
- project "zlib"
- uuid "1654FB18-FDE6-406F-9D84-BA12BFBD67B2"
- language "C"
- location "../build/gen"
- objdir "../build/obj/zlib"
- includedirs { "../include/zlib" }
- files {
- "../include/zlib/adler32.c",
- "../include/zlib/compress.c",
- "../include/zlib/crc32.c",
- "../include/zlib/deflate.c",
- "../include/zlib/gzclose.c",
- "../include/zlib/gzlib.c",
- "../include/zlib/gzread.c",
- "../include/zlib/gzwrite.c",
- "../include/zlib/infback.c",
- "../include/zlib/inffast.c",
- "../include/zlib/inflate.c",
- "../include/zlib/inftrees.c",
- "../include/zlib/trees.c",
- "../include/zlib/uncompr.c",
- "../include/zlib/zutil.c",
- }
- files {
- "../include/zlib/crc32.h",
- "../include/zlib/deflate.h",
- "../include/zlib/gzguts.h",
- "../include/zlib/inffast.h",
- "../include/zlib/inffixed.h",
- "../include/zlib/inflate.h",
- "../include/zlib/inftrees.h",
- "../include/zlib/trees.h",
- "../include/zlib/zconf.h",
- "../include/zlib/zlib.h",
- "../include/zlib/zutil.h",
- }
- dofile "../build/premake4-defaults-LIB.lua"
- dofile "../build/premake4-defaults-static.lua"
-
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-24 15:21:33
|
Revision: 4979
http://sourceforge.net/p/modplug/code/4979
Author: manxorist
Date: 2015-04-24 15:21:18 +0000 (Fri, 24 Apr 2015)
Log Message:
-----------
[Ref] sounddev: Move TimeInfo calculation to a single place in SourceAudioPreRead().
[Ref] sounddev: Move stream position calculation from ASIO to generic code for devices that provides hardware timing information.
[Fix] sounddev: Avoid blocking on the stream position mutex for any device that provides GetStreamPosition() or GetTimeInfo().
[Fix] sounddev: Avoid blocking on the stream position mutex when only gathering statistics.
[Ref] sounddev: Move the current chunk size and render stream position information into struct TimeInfo.
[Ref] sounddev: Simplify parameter list of the SourceAudioDone() callback.
[Mod] OpenMPT: Version is now 1.25.00.02
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/sounddev/SoundDevice.cpp
trunk/OpenMPT/sounddev/SoundDevice.h
trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
trunk/OpenMPT/sounddev/SoundDeviceASIO.h
trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h
trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
trunk/OpenMPT/sounddev/SoundDevicePortAudio.h
trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/common/versionNumber.h 2015-04-24 15:21:18 UTC (rev 4979)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 25
#define VER_MINOR 00
-#define VER_MINORMINOR 01
+#define VER_MINORMINOR 02
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2015-04-24 15:21:18 UTC (rev 4979)
@@ -718,12 +718,12 @@
//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
- ASSERT(InAudioThread());
+ MPT_ASSERT(InAudioThread());
OPENMPT_PROFILE_FUNCTION(Profiler::Audio);
TimingInfo timingInfo;
timingInfo.OutputLatency = bufferAttributes.Latency;
- timingInfo.StreamFrames = timeInfo.StreamFrames;
- timingInfo.SystemTimestamp = timeInfo.SystemTimestamp;
+ timingInfo.StreamFrames = timeInfo.SyncPointStreamFrames;
+ timingInfo.SystemTimestamp = timeInfo.SyncPointSystemTimestamp;
timingInfo.Speed = timeInfo.Speed;
m_pSndFile->m_TimingInfo = timingInfo;
m_Dither.SetMode((DitherMode)settings.DitherType);
@@ -747,17 +747,18 @@
}
-void CMainFrame::SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, SoundDevice::StreamPosition streamPosition)
-//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+void CMainFrame::SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo)
+//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
{
MPT_TRACE();
MPT_UNREFERENCED_PARAMETER(settings);
MPT_UNREFERENCED_PARAMETER(flags);
MPT_UNREFERENCED_PARAMETER(bufferAttributes);
- MPT_UNREFERENCED_PARAMETER(timeInfo);
- ASSERT(InAudioThread());
+ MPT_ASSERT(InAudioThread());
OPENMPT_PROFILE_FUNCTION(Profiler::Notify);
- DoNotification(numFrames, streamPosition.Frames);
+ std::size_t numFrames = static_cast<std::size_t>(timeInfo.RenderStreamPositionAfter.Frames - timeInfo.RenderStreamPositionBefore.Frames);
+ int64 streamPosition = timeInfo.RenderStreamPositionAfter.Frames;
+ DoNotification(numFrames, streamPosition);
//m_pSndFile->m_TimingInfo = TimingInfo(); // reset
}
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2015-04-24 15:21:18 UTC (rev 4979)
@@ -411,7 +411,7 @@
bool SoundSourceIsLockedByCurrentThread() const;
void SoundSourceLock();
void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer);
- void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, SoundDevice::StreamPosition streamPosition);
+ void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo);
void SoundSourceUnlock();
// from SoundDevice::IMessageReceiver
Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDevice.cpp 2015-04-24 15:21:18 UTC (rev 4979)
@@ -142,7 +142,6 @@
m_DeviceUnavailableOnOpen = false;
m_IsPlaying = false;
- m_CurrentUpdateInterval = 0.0;
m_StreamPositionRenderFrames = 0;
m_StreamPositionOutputFrames = 0;
@@ -168,14 +167,6 @@
}
-void Base::UpdateTimeInfo(SoundDevice::TimeInfo timeInfo)
-//-------------------------------------------------------
-{
- MPT_TRACE();
- m_TimeInfo = timeInfo;
-}
-
-
bool Base::Init(const SoundDevice::AppInfo &appInfo)
//--------------------------------------------------
{
@@ -295,37 +286,45 @@
}
-void Base::SourceAudioPreRead(std::size_t numFrames)
-//--------------------------------------------------
+void Base::SourceAudioPreRead(std::size_t numFrames, std::size_t framesLatency)
+//-----------------------------------------------------------------------------
{
MPT_TRACE();
if(!InternalHasTimeInfo())
{
+ SoundDevice::TimeInfo timeInfo;
if(InternalHasGetStreamPosition())
{
- SoundDevice::TimeInfo timeInfo;
- timeInfo.StreamFrames = InternalHasGetStreamPosition();
- timeInfo.SystemTimestamp = SourceGetReferenceClockNowNanoseconds();
+ timeInfo.SyncPointStreamFrames = InternalHasGetStreamPosition();
+ timeInfo.SyncPointSystemTimestamp = SourceGetReferenceClockNowNanoseconds();
timeInfo.Speed = 1.0;
- UpdateTimeInfo(timeInfo);
} else
{
- SoundDevice::TimeInfo timeInfo;
- {
- Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
- timeInfo.StreamFrames = m_StreamPositionRenderFrames + numFrames;
- }
- timeInfo.SystemTimestamp = SourceGetReferenceClockNowNanoseconds() + Util::Round<int64>(GetEffectiveBufferAttributes().Latency * 1000000000.0);
+ timeInfo.SyncPointStreamFrames = m_StreamPositionRenderFrames + numFrames;
+ timeInfo.SyncPointSystemTimestamp = SourceGetReferenceClockNowNanoseconds() + Util::Round<int64>(GetEffectiveBufferAttributes().Latency * 1000000000.0);
timeInfo.Speed = 1.0;
- UpdateTimeInfo(timeInfo);
}
+ timeInfo.RenderStreamPositionBefore = StreamPositionFromFrames(m_StreamPositionRenderFrames);
+ timeInfo.RenderStreamPositionAfter = StreamPositionFromFrames(m_StreamPositionRenderFrames + numFrames);
+ SetTimeInfo(timeInfo);
}
+ m_StreamPositionRenderFrames += numFrames;
+ if(!InternalHasGetStreamPosition() && !InternalHasTimeInfo())
+ {
+ Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
+ m_StreamPositionOutputFrames = m_StreamPositionRenderFrames - framesLatency;
+ } else
+ {
+ // unused, no locking
+ m_StreamPositionOutputFrames = 0;
+ }
}
void Base::SourceAudioRead(void *buffer, std::size_t numFrames)
//-------------------------------------------------------------
{
+ MPT_TRACE();
if(numFrames <= 0)
{
return;
@@ -334,23 +333,11 @@
}
-void Base::SourceAudioDone(std::size_t numFrames, std::size_t framesLatency)
-//--------------------------------------------------------------------------
+void Base::SourceAudioDone()
+//--------------------------
{
MPT_TRACE();
- if(numFrames <= 0)
- {
- return;
- }
- int64 framesRendered = 0;
- {
- Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
- m_CurrentUpdateInterval = (double)numFrames / (double)m_Settings.Samplerate;
- m_StreamPositionRenderFrames += numFrames;
- m_StreamPositionOutputFrames = m_StreamPositionRenderFrames - framesLatency;
- framesRendered = m_StreamPositionRenderFrames;
- }
- m_Source->SoundSourceDone(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo, numFrames, StreamPosition(framesRendered, StreamPositionFramesToSeconds(framesRendered)));
+ m_Source->SoundSourceDone(m_Settings, m_Flags, GetEffectiveBufferAttributes(), m_TimeInfo);
}
@@ -373,10 +360,9 @@
if(!IsOpen()) return false;
if(!IsPlaying())
{
+ m_StreamPositionRenderFrames = 0;
{
Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
- m_CurrentUpdateInterval = 0.0;
- m_StreamPositionRenderFrames = 0;
m_StreamPositionOutputFrames = 0;
}
SourceNotifyPreStart();
@@ -411,23 +397,13 @@
m_IsPlaying = false;
{
Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
- m_CurrentUpdateInterval = 0.0;
- m_StreamPositionRenderFrames = 0;
m_StreamPositionOutputFrames = 0;
}
+ m_StreamPositionRenderFrames = 0;
}
}
-double Base::GetLastUpdateInterval() const
-//----------------------------------------
-{
- MPT_TRACE();
- Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
- return m_CurrentUpdateInterval;
-}
-
-
SoundDevice::StreamPosition Base::GetStreamPosition() const
//---------------------------------------------------------
{
@@ -436,20 +412,25 @@
{
return StreamPosition();
}
- if(m_Settings.Samplerate <= 0)
- {
- return StreamPosition();
- }
int64 frames = 0;
if(InternalHasGetStreamPosition())
{
frames = InternalGetStreamPositionFrames();
+ } else if(InternalHasTimeInfo())
+ {
+ const uint64 now = SourceGetReferenceClockNowNanoseconds();
+ const SoundDevice::TimeInfo timeInfo = GetTimeInfo();
+ frames = Util::Round<int64>(
+ timeInfo.SyncPointStreamFrames + (
+ static_cast<double>(static_cast<int64>(now - timeInfo.SyncPointSystemTimestamp)) * timeInfo.Speed * m_Settings.Samplerate * (1.0 / (1000.0 * 1000.0))
+ )
+ );
} else
{
Util::lock_guard<Util::mutex> lock(m_StreamPositionMutex);
frames = m_StreamPositionOutputFrames;
}
- return StreamPosition(frames, StreamPositionFramesToSeconds(frames));
+ return StreamPositionFromFrames(frames);
}
@@ -459,7 +440,7 @@
MPT_TRACE();
SoundDevice::Statistics result;
result.InstantaneousLatency = m_Settings.Latency;
- result.LastUpdateInterval = GetLastUpdateInterval();
+ result.LastUpdateInterval = m_Settings.UpdateInterval;
result.text = mpt::ustring();
return result;
}
Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDevice.h 2015-04-24 15:21:18 UTC (rev 4979)
@@ -37,27 +37,34 @@
};
+struct StreamPosition
+{
+ int64 Frames; // relative to Start()
+ double Seconds; // relative to Start()
+ StreamPosition() : Frames(0), Seconds(0.0) { }
+ StreamPosition(int64 frames, double seconds) : Frames(frames), Seconds(seconds) { }
+};
+
+
struct TimeInfo
{
- int64 StreamFrames; // can actually be negative (e.g. when starting the stream)
- uint64 SystemTimestamp;
+
+ int64 SyncPointStreamFrames;
+ uint64 SyncPointSystemTimestamp;
double Speed;
+
+ SoundDevice::StreamPosition RenderStreamPositionBefore;
+ SoundDevice::StreamPosition RenderStreamPositionAfter;
+ // int64 chunkSize = After - Before
+
TimeInfo()
- : StreamFrames(0)
- , SystemTimestamp(0)
+ : SyncPointStreamFrames(0)
+ , SyncPointSystemTimestamp(0)
, Speed(1.0)
{
return;
}
-};
-
-struct StreamPosition
-{
- int64 Frames; // relative to Start()
- double Seconds; // relative to Start()
- StreamPosition() : Frames(0), Seconds(0.0) { }
- StreamPosition(int64 frames, double seconds) : Frames(frames), Seconds(seconds) { }
};
@@ -77,7 +84,7 @@
virtual bool SoundSourceIsLockedByCurrentThread() const = 0;
virtual void SoundSourceLock() = 0;
virtual void SoundSourceRead(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, void *buffer) = 0;
- virtual void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo, std::size_t numFrames, SoundDevice::StreamPosition streamPosition) = 0;
+ virtual void SoundSourceDone(const SoundDevice::Settings &settings, const SoundDevice::Flags &flags, const SoundDevice::BufferAttributes &bufferAttributes, SoundDevice::TimeInfo timeInfo) = 0;
virtual void SoundSourceUnlock() = 0;
public:
class Guard
@@ -588,9 +595,9 @@
SoundDevice::TimeInfo m_TimeInfo;
+ int64 m_StreamPositionRenderFrames; // only updated or read in audio CALLBACK or when device is stopped. requires no further locking
+
mutable Util::mutex m_StreamPositionMutex;
- double m_CurrentUpdateInterval;
- int64 m_StreamPositionRenderFrames;
int64 m_StreamPositionOutputFrames;
mpt::atomic_uint32_t m_RequestFlags;
@@ -610,9 +617,9 @@
void SourceNotifyPostStop();
bool SourceIsLockedByCurrentThread() const;
void SourceFillAudioBufferLocked();
- void SourceAudioPreRead(std::size_t numFrames);
+ void SourceAudioPreRead(std::size_t numFrames, std::size_t framesLatency);
void SourceAudioRead(void *buffer, std::size_t numFrames);
- void SourceAudioDone(std::size_t numFrames, std::size_t framesLatency);
+ void SourceAudioDone();
void RequestClose() { m_RequestFlags.fetch_or(RequestFlagClose); }
void RequestReset() { m_RequestFlags.fetch_or(RequestFlagReset); }
@@ -622,9 +629,9 @@
protected:
- void UpdateTimeInfo(SoundDevice::TimeInfo timeInfo);
+ void SetTimeInfo(SoundDevice::TimeInfo timeInfo) { m_TimeInfo = timeInfo; }
- double StreamPositionFramesToSeconds(int64 frames) const { return static_cast<double>(frames) / static_cast<double>(m_Settings.Samplerate); }
+ SoundDevice::StreamPosition StreamPositionFromFrames(int64 frames) const { return SoundDevice::StreamPosition(frames, static_cast<double>(frames) / static_cast<double>(m_Settings.Samplerate)); }
virtual bool InternalHasTimeInfo() const { return false; }
@@ -643,8 +650,6 @@
virtual SoundDevice::BufferAttributes InternalGetEffectiveBufferAttributes() const = 0;
- double GetLastUpdateInterval() const;
-
protected:
Base(SoundDevice::Info info);
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2015-04-24 15:21:18 UTC (rev 4979)
@@ -879,7 +879,7 @@
}
} else
{
- SourceAudioPreRead(countChunk);
+ SourceAudioPreRead(countChunk, m_nAsioBufferLen);
if(m_Settings.sampleFormat == SampleFormatFloat32)
{
SourceAudioRead(&m_SampleBufferFloat[0], countChunk);
@@ -1008,7 +1008,7 @@
}
if(!rendersilence)
{
- SourceAudioDone(countChunk, m_nAsioBufferLen);
+ SourceAudioDone();
}
}
@@ -1021,35 +1021,6 @@
}
-bool CASIODevice::InternalHasGetStreamPosition() const
-//----------------------------------------------------
-{
- MPT_TRACE();
- return m_Settings.UseHardwareTiming;
-}
-
-
-int64 CASIODevice::InternalGetStreamPositionFrames() const
-//--------------------------------------------------------
-{
- MPT_TRACE();
- if(m_Settings.UseHardwareTiming)
- {
- const uint64 asioNow = SourceGetReferenceClockNowNanoseconds();
- SoundDevice::TimeInfo timeInfo = GetTimeInfo();
- int64 currentStreamPositionFrames =
- Util::Round<int64>(
- timeInfo.StreamFrames + ((double)((int64)(asioNow - timeInfo.SystemTimestamp)) * timeInfo.Speed * m_Settings.Samplerate / (1000.0 * 1000.0))
- )
- ;
- return currentStreamPositionFrames;
- } else
- {
- return SoundDevice::Base::InternalGetStreamPositionFrames();
- }
-}
-
-
SoundDevice::BufferAttributes CASIODevice::InternalGetEffectiveBufferAttributes() const
//-------------------------------------------------------------------------------------
{
@@ -1061,12 +1032,13 @@
}
-void CASIODevice::UpdateTimeInfo(AsioTimeInfo asioTimeInfo)
-//---------------------------------------------------------
+void CASIODevice::ApplyAsioTimeInfo(AsioTimeInfo asioTimeInfo)
+//------------------------------------------------------------
{
MPT_TRACE();
if(m_Settings.UseHardwareTiming)
{
+ SoundDevice::TimeInfo timeInfo;
if((asioTimeInfo.flags & kSamplePositionValid) && (asioTimeInfo.flags & kSystemTimeValid))
{
double speed = 1.0;
@@ -1077,20 +1049,19 @@
{
speed *= asioTimeInfo.sampleRate / m_Settings.Samplerate;
}
- SoundDevice::TimeInfo timeInfo;
- timeInfo.StreamFrames = ((((uint64)asioTimeInfo.samplePosition.hi) << 32) | asioTimeInfo.samplePosition.lo) - m_StreamPositionOffset;
- timeInfo.SystemTimestamp = (((uint64)asioTimeInfo.systemTime.hi) << 32) | asioTimeInfo.systemTime.lo;
+ timeInfo.SyncPointStreamFrames = ((((uint64)asioTimeInfo.samplePosition.hi) << 32) | asioTimeInfo.samplePosition.lo) - m_StreamPositionOffset;
+ timeInfo.SyncPointSystemTimestamp = (((uint64)asioTimeInfo.systemTime.hi) << 32) | asioTimeInfo.systemTime.lo;
timeInfo.Speed = speed;
- SoundDevice::Base::UpdateTimeInfo(timeInfo);
} else
{ // spec violation or nothing provided at all, better to estimate this stuff ourselves
const uint64 asioNow = SourceGetReferenceClockNowNanoseconds();
- SoundDevice::TimeInfo timeInfo;
- timeInfo.StreamFrames = m_TotalFramesWritten + m_nAsioBufferLen - m_StreamPositionOffset;
- timeInfo.SystemTimestamp = asioNow + Util::Round<int64>(m_BufferLatency * 1000.0 * 1000.0 * 1000.0);
+ timeInfo.SyncPointStreamFrames = m_TotalFramesWritten + m_nAsioBufferLen - m_StreamPositionOffset;
+ timeInfo.SyncPointSystemTimestamp = asioNow + Util::Round<int64>(m_BufferLatency * 1000.0 * 1000.0 * 1000.0);
timeInfo.Speed = 1.0;
- SoundDevice::Base::UpdateTimeInfo(timeInfo);
}
+ timeInfo.RenderStreamPositionBefore = StreamPositionFromFrames(m_TotalFramesWritten - m_StreamPositionOffset);
+ timeInfo.RenderStreamPositionAfter = StreamPositionFromFrames(m_TotalFramesWritten - m_StreamPositionOffset + m_nAsioBufferLen);
+ SetTimeInfo(timeInfo);
}
}
@@ -1128,14 +1099,13 @@
}
if(m_Settings.UseHardwareTiming)
{
+ AsioTimeInfo asioTimeInfo;
+ MemsetZero(asioTimeInfo);
if(params)
{
- UpdateTimeInfo(params->timeInfo);
+ asioTimeInfo = params->timeInfo;
} else
{
- AsioTimeInfo asioTimeInfo;
- MemsetZero(asioTimeInfo);
- UpdateTimeInfo(asioTimeInfo);
try
{
ASIOSamples samplePosition;
@@ -1166,8 +1136,8 @@
{
// continue
}
- UpdateTimeInfo(asioTimeInfo);
}
+ ApplyAsioTimeInfo(asioTimeInfo);
}
m_BufferIndex = doubleBufferIndex;
bool rendersilence = (InterlockedExchangeAdd(&m_RenderSilence, 0) == 1);
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.h 2015-04-24 15:21:18 UTC (rev 4979)
@@ -83,7 +83,7 @@
mutable mpt::atomic_uint32_t m_DebugRealtimeThreadID;
private:
- void UpdateTimeInfo(AsioTimeInfo asioTimeInfo);
+ void ApplyAsioTimeInfo(AsioTimeInfo asioTimeInfo);
static bool IsSampleTypeFloat(ASIOSampleType sampleType);
static bool IsSampleTypeInt16(ASIOSampleType sampleType);
@@ -134,8 +134,6 @@
bool IsDriverOpen() const { return (m_pAsioDrv != nullptr); }
bool InternalHasTimeInfo() const;
- bool InternalHasGetStreamPosition() const;
- int64 InternalGetStreamPositionFrames() const;
SoundDevice::BufferAttributes InternalGetEffectiveBufferAttributes() const;
Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp 2015-04-24 15:21:18 UTC (rev 4979)
@@ -77,7 +77,8 @@
, m_nDSoundBufferSize(0)
, m_bMixRunning(FALSE)
, m_dwWritePos(0)
- , m_dwLatency(0)
+ , m_StatisticLatencyFrames(0)
+ , m_StatisticPeriodFrames(0)
{
return;
}
@@ -240,7 +241,6 @@
Close();
return false;
}
- ///////////////////////////////////////////////////
// Create the secondary buffer
dsbd.dwSize = sizeof(dsbd);
dsbd.dwFlags = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2;
@@ -355,6 +355,8 @@
return;
}
+ DWORD dwLatency = 0;
+
for(int refillCount = 0; refillCount < 2; ++refillCount)
{
// Refill the buffer at most twice so we actually sleep some time when CPU is overloaded.
@@ -374,12 +376,12 @@
{
// startup
m_dwWritePos = dwWrite;
- m_dwLatency = 0;
+ dwLatency = 0;
} else
{
// running
- m_dwLatency = (m_dwWritePos - dwPlay + m_nDSoundBufferSize) % m_nDSoundBufferSize;
- m_dwLatency = (m_dwLatency + m_nDSoundBufferSize - 1) % m_nDSoundBufferSize + 1;
+ dwLatency = (m_dwWritePos - dwPlay + m_nDSoundBufferSize) % m_nDSoundBufferSize;
+ dwLatency = (dwLatency + m_nDSoundBufferSize - 1) % m_nDSoundBufferSize + 1;
dwBytes = (dwPlay - m_dwWritePos + m_nDSoundBufferSize) % m_nDSoundBufferSize;
dwBytes = Clamp(dwBytes, DWORD(0), m_nDSoundBufferSize/2); // limit refill amount to half the buffer size
}
@@ -414,7 +416,7 @@
return;
}
- SourceAudioPreRead(dwSize1/bytesPerFrame + dwSize2/bytesPerFrame);
+ SourceAudioPreRead(dwSize1/bytesPerFrame + dwSize2/bytesPerFrame, dwLatency/bytesPerFrame);
SourceAudioRead(buf1, dwSize1/bytesPerFrame);
SourceAudioRead(buf2, dwSize2/bytesPerFrame);
@@ -462,7 +464,9 @@
m_bMixRunning = TRUE;
}
- SourceAudioDone(dwSize1/bytesPerFrame + dwSize2/bytesPerFrame, m_dwLatency/bytesPerFrame);
+ m_StatisticLatencyFrames.store(dwLatency/bytesPerFrame);
+ m_StatisticPeriodFrames.store(dwSize1/bytesPerFrame + dwSize2/bytesPerFrame);
+ SourceAudioDone();
if(dwBytes < m_nDSoundBufferSize/2)
{
@@ -492,8 +496,8 @@
{
MPT_TRACE();
SoundDevice::Statistics result;
- result.InstantaneousLatency = 1.0 * m_dwLatency / m_Settings.GetBytesPerSecond();
- result.LastUpdateInterval = GetLastUpdateInterval();
+ result.InstantaneousLatency = 1.0 * m_StatisticLatencyFrames.load() / m_Settings.Samplerate;
+ result.LastUpdateInterval = 1.0 * m_StatisticPeriodFrames.load() / m_Settings.Samplerate;
result.text = mpt::ustring();
return result;
}
Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h 2015-04-24 15:21:18 UTC (rev 4979)
@@ -40,8 +40,10 @@
DWORD m_nDSoundBufferSize;
BOOL m_bMixRunning;
DWORD m_dwWritePos;
- DWORD m_dwLatency;
+ mpt::atomic_uint32_t m_StatisticLatencyFrames;
+ mpt::atomic_uint32_t m_StatisticPeriodFrames;
+
public:
CDSoundDevice(SoundDevice::Info info);
~CDSoundDevice();
Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2015-04-24 15:21:18 UTC (rev 4979)
@@ -40,6 +40,7 @@
CPortaudioDevice::CPortaudioDevice(SoundDevice::Info info)
//--------------------------------------------------------
: SoundDevice::Base(info)
+ , m_StatisticPeriodFrames(0)
{
m_HostApi = SndDevTypeToHostApi(info.id.GetType());
MemsetZero(m_StreamParameters);
@@ -175,9 +176,10 @@
//----------------------------------------------
{
if(m_CurrentFrameCount == 0) return;
- SourceAudioPreRead(m_CurrentFrameCount);
+ SourceAudioPreRead(m_CurrentFrameCount, Util::Round<std::size_t>(m_CurrentRealLatency * m_StreamInfo->sampleRate));
SourceAudioRead(m_CurrentFrameBuffer, m_CurrentFrameCount);
- SourceAudioDone(m_CurrentFrameCount, Util::Round<std::size_t>(m_CurrentRealLatency * m_StreamInfo->sampleRate));
+ m_StatisticPeriodFrames.store(m_CurrentFrameCount);
+ SourceAudioDone();
}
@@ -206,7 +208,7 @@
MPT_TRACE();
SoundDevice::Statistics result;
result.InstantaneousLatency = m_CurrentRealLatency;
- result.LastUpdateInterval = GetLastUpdateInterval();
+ result.LastUpdateInterval = 1.0 * m_StatisticPeriodFrames / m_Settings.Samplerate;
result.text = mpt::ustring();
return result;
}
Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.h 2015-04-24 15:21:18 UTC (rev 4979)
@@ -44,6 +44,7 @@
unsigned long m_CurrentFrameCount;
double m_CurrentRealLatency; // seconds
+ mpt::atomic_uint32_t m_StatisticPeriodFrames;
public:
CPortaudioDevice(SoundDevice::Info info);
Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-04-23 19:56:35 UTC (rev 4978)
+++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp 2015-04-24 15:21:18 UTC (rev 4979)
@@ -259,9 +259,9 @@
ULONG nBytesWritten = 0;
while(oldBuffersPending < m_nPreparedHeaders)
{
- SourceAudioPreRead(m_nWaveBufferSize / bytesPerFrame);
+ nLatency += m_nWaveBufferSize;
+ SourceAudioPreRead(m_nWaveBufferSize / bytesPerFrame, nLatency / bytesPerFrame);
SourceAudioRead(m_WaveBuffers[m_nWriteBuffer].lpData, m_nWaveBufferSize / bytesPerFrame);
- nLatency += m_nWaveBufferSize;
nBytesWritten += m_nWaveBufferSize;
m_WaveBuffers[m_nWriteBuffer].dwBufferLength = m_nWaveBufferSize;
InterlockedIncrement(&m_nBuffersPending);
@@ -269,7 +269,7 @@
waveOutWrite(m_hWaveOut, &m_WaveBuffers[m_nWriteBuffer], sizeof(WAVEHDR));
m_nWriteBuffer++;
m_nWriteBuffer %= m_nPreparedHeaders;
- SourceAudioDone(m_nWaveBufferSize / bytesPerFrame, nLatency / bytesPerFrame);
+ SourceAudioDone();
}
if(m_JustStarted)
@@ -338,7 +338,7 @@
MPT_TRACE();
SoundDevice::Statistics result;
result.InstantaneousLatency = InterlockedExchangeAdd(&m_nBuffersPending, 0) * m_nWaveBufferSize * 1.0 / m_Settings.GetBytesPerSecond();
- result.LastUpdateInterval = GetLastUpdateInterval();
+ result.LastUpdateInterval = 1.0 * m_nWaveBufferSize / m_Settings.GetBytesPerSecond();
result.text = mpt::ustring();
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-24 17:31:49
|
Revision: 4984
http://sourceforge.net/p/modplug/code/4984
Author: manxorist
Date: 2015-04-24 17:31:36 +0000 (Fri, 24 Apr 2015)
Log Message:
-----------
[Ref] UNICODE build support in soundlib/plugins/PluginManager.cpp.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MPTrackUtil.cpp
trunk/OpenMPT/mptrack/MPTrackUtil.h
trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
Modified: trunk/OpenMPT/mptrack/MPTrackUtil.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MPTrackUtil.cpp 2015-04-24 16:44:05 UTC (rev 4983)
+++ trunk/OpenMPT/mptrack/MPTrackUtil.cpp 2015-04-24 17:31:36 UTC (rev 4984)
@@ -49,10 +49,10 @@
// Returns WinAPI error message corresponding to error code returned by GetLastError().
-std::string GetErrorMessage(DWORD nErrorCode)
-//-------------------------------------------
+CString GetErrorMessage(DWORD nErrorCode)
+//---------------------------------------
{
- LPVOID lpMsgBuf;
+ LPTSTR lpMsgBuf = NULL;
FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
@@ -62,7 +62,7 @@
0,
NULL );
- std::string msg = (LPTSTR)lpMsgBuf;
+ CString msg = lpMsgBuf;
LocalFree(lpMsgBuf);
return msg;
Modified: trunk/OpenMPT/mptrack/MPTrackUtil.h
===================================================================
--- trunk/OpenMPT/mptrack/MPTrackUtil.h 2015-04-24 16:44:05 UTC (rev 4983)
+++ trunk/OpenMPT/mptrack/MPTrackUtil.h 2015-04-24 17:31:36 UTC (rev 4984)
@@ -19,7 +19,7 @@
LPCCH LoadResource(LPCTSTR lpName, LPCTSTR lpType, LPCCH& pData, size_t& nSize, HGLOBAL& hglob);
-std::string GetErrorMessage(DWORD nErrorCode);
+CString GetErrorMessage(DWORD nErrorCode);
namespace Util
{
Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp 2015-04-24 16:44:05 UTC (rev 4983)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp 2015-04-24 17:31:36 UTC (rev 4984)
@@ -247,9 +247,11 @@
#ifdef _DEBUG
if(error != ERROR_MOD_NOT_FOUND) // "File not found errors" are annoying.
{
- TCHAR szBuf[256];
- wsprintf(szBuf, "Warning: encountered problem when loading plugin dll. Error %x: %s", error, GetErrorMessage(error).c_str());
- Reporting::Error(szBuf, "DEBUG: Error when loading plugin dll");
+ mpt::ustring buf = mpt::String::Print(MPT_USTRING("Warning: encountered problem when loading plugin dll. Error %1: %2")
+ , mpt::ufmt::hex(error)
+ , mpt::ToUnicode(GetErrorMessage(error))
+ );
+ Reporting::Error(buf, "DEBUG: Error when loading plugin dll");
}
#endif //_DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-25 10:23:44
|
Revision: 4990
http://sourceforge.net/p/modplug/code/4990
Author: manxorist
Date: 2015-04-25 10:23:39 +0000 (Sat, 25 Apr 2015)
Log Message:
-----------
[Fix] Fix various problems and possible crashes spotted by VS2010 static analyzer.
Modified Paths:
--------------
trunk/OpenMPT/common/mptFileIO.h
trunk/OpenMPT/common/mptString.cpp
trunk/OpenMPT/common/serialization_utils.cpp
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_stm.cpp
trunk/OpenMPT/soundlib/Mmcmp.cpp
trunk/OpenMPT/soundlib/pattern.cpp
Modified: trunk/OpenMPT/common/mptFileIO.h
===================================================================
--- trunk/OpenMPT/common/mptFileIO.h 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/common/mptFileIO.h 2015-04-25 10:23:39 UTC (rev 4990)
@@ -34,7 +34,7 @@
//-------------------------------------------------------------------------------
{
#if MPT_OS_WINDOWS
- return _wfopen(filename.AsNative().c_str(), mode ? mpt::ToWide(mpt::CharsetASCII, mode).c_str() : nullptr);
+ return _wfopen(filename.AsNative().c_str(), mode ? mpt::ToWide(mpt::CharsetASCII, mode).c_str() : L"");
#else // !MPT_OS_WINDOWS
return fopen(filename.AsNative().c_str(), mode);
#endif // MPT_OS_WINDOWS
Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/common/mptString.cpp 2015-04-25 10:23:39 UTC (rev 4990)
@@ -201,7 +201,7 @@
for(std::size_t i = 0; i < str.length(); ++i)
{
uint32 c = static_cast<uint32>(static_cast<uint8>(str[i]));
- if(c <= CountOf(table))
+ if(c < CountOf(table))
{
res.push_back(static_cast<wchar_t>(static_cast<uint32>(table[c])));
} else
Modified: trunk/OpenMPT/common/serialization_utils.cpp
===================================================================
--- trunk/OpenMPT/common/serialization_utils.cpp 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/common/serialization_utils.cpp 2015-04-25 10:23:39 UTC (rev 4990)
@@ -54,7 +54,7 @@
{
for(std::size_t i = 0; i < m_ID.length(); ++i)
{
- if(m_ID[i] <= 0 || isprint(m_ID[i]) == 0)
+ if(m_ID[i] <= 0 || isprint(static_cast<unsigned char>(m_ID[i])) == 0)
{
return false;
}
Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp 2015-04-25 10:23:39 UTC (rev 4990)
@@ -97,7 +97,7 @@
CMD_GLOBALVOLUME, // Global volume (0... 127)
};
- ModCommand dummy;
+ ModCommand dummy = ModCommand::Empty();
for(ROWINDEX row = 0; row < pattern.GetNumRows(); row++)
{
Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp 2015-04-25 10:23:39 UTC (rev 4990)
@@ -90,7 +90,7 @@
// Convert all multi-byte numeric values to current platform's endianness or vice versa.
void ConvertEndianness()
{
- for(std::size_t i = 0; i < 32; ++i)
+ for(std::size_t i = 0; i < 31; ++i)
{
samples[i].ConvertEndianness();
}
Modified: trunk/OpenMPT/soundlib/Mmcmp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Mmcmp.cpp 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/soundlib/Mmcmp.cpp 2015-04-25 10:23:39 UTC (rev 4990)
@@ -248,6 +248,7 @@
{
MMCMPBITBUFFER bb;
uint32 subblk = 0;
+ if(!psubblk) return false;
if(!MMCMP_IsDstBlockValid(unpackedData, psubblk[subblk])) return false;
char *pDest = &(unpackedData[psubblk[subblk].unpk_pos]);
uint32 dwSize = psubblk[subblk].unpk_size >> 1;
Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp 2015-04-24 21:05:15 UTC (rev 4989)
+++ trunk/OpenMPT/soundlib/pattern.cpp 2015-04-25 10:23:39 UTC (rev 4990)
@@ -619,7 +619,7 @@
mpt::IO::ReadIntLE<uint8>(iStrm, diffmask);
uint8 temp = 0;
- ModCommand dummy;
+ ModCommand dummy = ModCommand::Empty();
ModCommand& m = (ch < chns) ? *pat.GetpModCommand(row, ch) : dummy;
READITEM(noteBit, note);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-26 10:30:07
|
Revision: 5006
http://sourceforge.net/p/modplug/code/5006
Author: manxorist
Date: 2015-04-26 10:29:53 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
[Ref] build: Move premake-generated project files for external libraries to build/vs2008-ext and build/vs2010-ext.
Modified Paths:
--------------
trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua
trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua
trunk/OpenMPT/build/vs2008/libopenmpt.sln
trunk/OpenMPT/build/vs2010-ext/UnRAR.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/lhasa.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/miniz.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/minizip.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/portaudio.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/portmidi.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/pugixml.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/r8brain.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/smbPitchShift.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/soundtouch.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/zlib.vcxproj.filters
trunk/OpenMPT/libopenmpt/libopenmpt.sln
trunk/OpenMPT/libopenmpt/xmp-openmpt.vcxproj
trunk/OpenMPT/mptrack/MPTRACK_08.sln
trunk/OpenMPT/mptrack/MPTRACK_10.sln
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/openmpt123/openmpt123.sln
trunk/OpenMPT/openmpt123/openmpt123.vcxproj
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
Added Paths:
-----------
trunk/OpenMPT/build/vs2008-ext/
trunk/OpenMPT/build/vs2010-ext/
trunk/OpenMPT/build/vs2010-ext/pugixml.vcxproj.user
trunk/OpenMPT/build/vs2010-ext/r8brain.vcxproj.user
Removed Paths:
-------------
trunk/OpenMPT/build/gen/
trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj
trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/flac.vcxproj
trunk/OpenMPT/build/vs2008-ext/flac.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/flac.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/lhasa.vcxproj
trunk/OpenMPT/build/vs2008-ext/lhasa.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/lhasa.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/miniz.vcxproj
trunk/OpenMPT/build/vs2008-ext/miniz.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/miniz.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/minizip.vcxproj
trunk/OpenMPT/build/vs2008-ext/minizip.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/minizip.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/portaudio.vcxproj
trunk/OpenMPT/build/vs2008-ext/portaudio.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/portaudio.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/portmidi.vcxproj
trunk/OpenMPT/build/vs2008-ext/portmidi.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/portmidi.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/pugixml.vcxproj
trunk/OpenMPT/build/vs2008-ext/pugixml.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/r8brain.vcxproj
trunk/OpenMPT/build/vs2008-ext/r8brain.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/smbPitchShift.vcxproj
trunk/OpenMPT/build/vs2008-ext/smbPitchShift.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/smbPitchShift.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/soundtouch.vcxproj
trunk/OpenMPT/build/vs2008-ext/soundtouch.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/soundtouch.vcxproj.user
trunk/OpenMPT/build/vs2008-ext/zlib.vcxproj
trunk/OpenMPT/build/vs2008-ext/zlib.vcxproj.filters
trunk/OpenMPT/build/vs2008-ext/zlib.vcxproj.user
trunk/OpenMPT/build/vs2010-ext/UnRAR.vcproj
trunk/OpenMPT/build/vs2010-ext/flac.vcproj
trunk/OpenMPT/build/vs2010-ext/lhasa.vcproj
trunk/OpenMPT/build/vs2010-ext/miniz.vcproj
trunk/OpenMPT/build/vs2010-ext/minizip.vcproj
trunk/OpenMPT/build/vs2010-ext/portaudio.vcproj
trunk/OpenMPT/build/vs2010-ext/portmidi.vcproj
trunk/OpenMPT/build/vs2010-ext/pugixml.vcproj
trunk/OpenMPT/build/vs2010-ext/r8brain.vcproj
trunk/OpenMPT/build/vs2010-ext/smbPitchShift.vcproj
trunk/OpenMPT/build/vs2010-ext/soundtouch.vcproj
trunk/OpenMPT/build/vs2010-ext/zlib.vcproj
Modified: trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-UnRAR.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "UnRAR"
uuid "95CC809B-03FC-4EDB-BB20-FD07A698C05F"
language "C++"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/unrar"
includedirs { "../../include/unrar" }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "flac"
uuid "E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/flac"
includedirs { "../../include/flac/include", "../../include/flac/src/libFLAC/include" }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-lhasa.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "lhasa"
uuid "6B11F6A8-B131-4D2B-80EF-5731A9016436"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/lhasa"
includedirs { "../../include/msinttypes/inttypes" }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-miniz.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "miniz"
uuid "B5E0C06B-8121-426A-8FFB-4293ECAAE29C"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/miniz"
files {
"../../include/miniz/miniz.c",
Modified: trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-minizip.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "minizip"
uuid "63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/minizip"
includedirs { "../../include/zlib", "../../include/zlib/contrib/minizip" }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-portaudio.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "portaudio"
uuid "189B867F-FF4B-45A1-B741-A97492EE69AF"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/portaudio"
includedirs { "../../include/portaudio/include", "../../include/portaudio/src/common", "../../include/portaudio/src/os/win" }
defines {
Modified: trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-portmidi.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "portmidi"
uuid "2512E2CA-578A-4F10-9363-4BFC9A5EF960"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/portmidi"
includedirs { "../../include/portmidi/porttime", "../../include/portmidi/pm_common", "../../include/portmidi/pm_win" }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-pugixml.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "pugixml"
uuid "07B89124-7C71-42cc-81AB-62B09BB61F9B"
language "C++"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/pugixml"
includedirs { }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-r8brain.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "r8brain"
uuid "BC116B29-9958-4389-B294-7529BB7C7D37"
language "C++"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/r8brain"
includedirs { "../../include/r8brain" }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-smbPitchShift.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "smbPitchShift"
uuid "89AF16DD-32CC-4A7E-B219-5F117D761F9F"
language "C++"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/smbPitchShift"
includedirs { }
files {
Modified: trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-soundtouch.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "soundtouch"
uuid "F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD"
language "C++"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/soundtouch"
targetname "OpenMPT_SoundTouch_f32"
includedirs { "../../include/soundtouch/include" }
Modified: trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/premake4-win/ext-zlib.premake4.lua 2015-04-26 10:29:53 UTC (rev 5006)
@@ -2,7 +2,7 @@
project "zlib"
uuid "1654FB18-FDE6-406F-9D84-BA12BFBD67B2"
language "C"
- location "../../build/gen"
+ location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/zlib"
includedirs { "../../include/zlib" }
files {
Modified: trunk/OpenMPT/build/vs2008/libopenmpt.sln
===================================================================
--- trunk/OpenMPT/build/vs2008/libopenmpt.sln 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/vs2008/libopenmpt.sln 2015-04-26 10:29:53 UTC (rev 5006)
@@ -3,7 +3,7 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt", "libopenmpt\libopenmpt.vcproj", "{D19450B0-4497-418C-B3EC-10D51967814E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\gen\portaudio.vcproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\vs2008-ext\portaudio.vcproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_example_c", "libopenmpt_example_c\libopenmpt_example_c.vcproj", "{89D1117D-7787-45C1-9240-A24AACF4A414}"
ProjectSection(ProjectDependencies) = postProject
Index: trunk/OpenMPT/build/vs2008-ext
===================================================================
--- trunk/OpenMPT/build/gen 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/vs2008-ext 2015-04-26 10:29:53 UTC (rev 5006)
Property changes on: trunk/OpenMPT/build/vs2008-ext
___________________________________________________________________
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Deleted: trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/build/gen/UnRAR.vcxproj 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj 2015-04-26 10:29:53 UTC (rev 5006)
@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseNoLTCG|Win32">
- <Configuration>ReleaseNoLTCG</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseNoLTCG|x64">
- <Configuration>ReleaseNoLTCG</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid>
- <RootNamespace>UnRAR</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <UseDebugLibraries>true</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <UseDebugLibraries>true</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\x32\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\unrar\x32\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\x64\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\unrar\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\x32\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\unrar\x32\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\x64\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\unrar\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\lib\x32\ReleaseNoLTCG\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\obj\unrar\x32\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">UnRAR</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\lib\x64\ReleaseNoLTCG\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\obj\unrar\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
- </Lib>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
- </Lib>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <FloatingPointModel>Fast</FloatingPointModel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
- </Lib>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <FloatingPointModel>Fast</FloatingPointModel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
- </Lib>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
- <ClCompile>
- <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <FloatingPointModel>Fast</FloatingPointModel>
- <DebugInformationFormat></DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
- </Lib>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
- <ClCompile>
- <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <FloatingPointModel>Fast</FloatingPointModel>
- <DebugInformationFormat></DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Lib>
- <OutputFile>$(OutDir)UnRAR.lib</OutputFile>
- </Lib>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="..\..\include\unrar\archive.hpp" />
- <ClInclude Include="..\..\include\unrar\array.hpp" />
- <ClInclude Include="..\..\include\unrar\blake2s.hpp" />
- <ClInclude Include="..\..\include\unrar\cmddata.hpp" />
- <ClInclude Include="..\..\include\unrar\coder.hpp" />
- <ClInclude Include="..\..\include\unrar\compress.hpp" />
- <ClInclude Include="..\..\include\unrar\consio.hpp" />
- <ClInclude Include="..\..\include\unrar\crc.hpp" />
- <ClInclude Include="..\..\include\unrar\crypt.hpp" />
- <ClInclude Include="..\..\include\unrar\dll.hpp" />
- <ClInclude Include="..\..\include\unrar\encname.hpp" />
- <ClInclude Include="..\..\include\unrar\errhnd.hpp" />
- <ClInclude Include="..\..\include\unrar\extinfo.hpp" />
- <ClInclude Include="..\..\include\unrar\extract.hpp" />
- <ClInclude Include="..\..\include\unrar\filcreat.hpp" />
- <ClInclude Include="..\..\include\unrar\file.hpp" />
- <ClInclude Include="..\..\include\unrar\filefn.hpp" />
- <ClInclude Include="..\..\include\unrar\filestr.hpp" />
- <ClInclude Include="..\..\include\unrar\find.hpp" />
- <ClInclude Include="..\..\include\unrar\getbits.hpp" />
- <ClInclude Include="..\..\include\unrar\global.hpp" />
- <ClInclude Include="..\..\include\unrar\hash.hpp" />
- <ClInclude Include="..\..\include\unrar\headers.hpp" />
- <ClInclude Include="..\..\include\unrar\headers5.hpp" />
- <ClInclude Include="..\..\include\unrar\isnt.hpp" />
- <ClInclude Include="..\..\include\unrar\list.hpp" />
- <ClInclude Include="..\..\include\unrar\loclang.hpp" />
- <ClInclude Include="..\..\include\unrar\log.hpp" />
- <ClInclude Include="..\..\include\unrar\match.hpp" />
- <ClInclude Include="..\..\include\unrar\model.hpp" />
- <ClInclude Include="..\..\include\unrar\openmpt.hpp" />
- <ClInclude Include="..\..\include\unrar\openmpt-callback.hpp" />
- <ClInclude Include="..\..\include\unrar\options.hpp" />
- <ClInclude Include="..\..\include\unrar\os.hpp" />
- <ClInclude Include="..\..\include\unrar\pathfn.hpp" />
- <ClInclude Include="..\..\include\unrar\qopen.hpp" />
- <ClInclude Include="..\..\include\unrar\rar.hpp" />
- <ClInclude Include="..\..\include\unrar\rardefs.hpp" />
- <ClInclude Include="..\..\include\unrar\rarlang.hpp" />
- <ClInclude Include="..\..\include\unrar\raros.hpp" />
- <ClInclude Include="..\..\include\unrar\rartypes.hpp" />
- <ClInclude Include="..\..\include\unrar\rarvm.hpp" />
- <ClInclude Include="..\..\include\unrar\rawread.hpp" />
- <ClInclude Include="..\..\include\unrar\rdwrfn.hpp" />
- <ClInclude Include="..\..\include\unrar\recvol.hpp" />
- <ClInclude Include="..\..\include\unrar\resource.hpp" />
- <ClInclude Include="..\..\include\unrar\rijndael.hpp" />
- <ClInclude Include="..\..\include\unrar\rs.hpp" />
- <ClInclude Include="..\..\include\unrar\rs16.hpp" />
- <ClInclude Include="..\..\include\unrar\savepos.hpp" />
- <ClInclude Include="..\..\include\unrar\scantree.hpp" />
- <ClInclude Include="..\..\include\unrar\secpassword.hpp" />
- <ClInclude Include="..\..\include\unrar\sha1.hpp" />
- <ClInclude Include="..\..\include\unrar\sha256.hpp" />
- <ClInclude Include="..\..\include\unrar\smallfn.hpp" />
- <ClInclude Include="..\..\include\unrar\strfn.hpp" />
- <ClInclude Include="..\..\include\unrar\strlist.hpp" />
- <ClInclude Include="..\..\include\unrar\suballoc.hpp" />
- <ClInclude Include="..\..\include\unrar\system.hpp" />
- <ClInclude Include="..\..\include\unrar\threadpool.hpp" />
- <ClInclude Include="..\..\include\unrar\timefn.hpp" />
- <ClInclude Include="..\..\include\unrar\ulinks.hpp" />
- <ClInclude Include="..\..\include\unrar\ui.hpp" />
- <ClInclude Include="..\..\include\unrar\unicode.hpp" />
- <ClInclude Include="..\..\include\unrar\unpack.hpp" />
- <ClInclude Include="..\..\include\unrar\version.hpp" />
- <ClInclude Include="..\..\include\unrar\volume.hpp" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\include\unrar\archive.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\arcread.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\blake2s.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\cmddata.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\consio.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\crc.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\crypt.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\encname.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\errhnd.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\extinfo.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\extract.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\filcreat.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\file.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\filefn.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\filestr.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\find.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\getbits.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\global.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\hash.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\headers.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\isnt.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\list.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\match.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\options.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\pathfn.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\qopen.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rar.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rarpch.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rarvm.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rawread.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rdwrfn.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\recvol.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\resource.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rijndael.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rs.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rs16.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\scantree.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\secpassword.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\sha1.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\sha256.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\smallfn.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\strfn.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\strlist.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\system.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\threadpool.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\timefn.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\ui.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\unicode.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\unpack.cpp">
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\volume.cpp">
- </ClCompile>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/gen/UnRAR.vcxproj.filters 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj.filters 2015-04-26 10:29:53 UTC (rev 5006)
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="include">
- <UniqueIdentifier>{3D2DB508-7F6C-B245-B03C-23D4A9584B7A}</UniqueIdentifier>
- </Filter>
- <Filter Include="include\unrar">
- <UniqueIdentifier>{A13FB596-A6F4-0540-8B8B-F667F6497761}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\include\unrar\archive.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\array.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\blake2s.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\cmddata.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\coder.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\compress.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\consio.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\crc.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\crypt.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\dll.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\encname.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\errhnd.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\extinfo.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\extract.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\filcreat.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\file.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\filefn.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\filestr.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\find.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\getbits.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\global.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\hash.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\headers.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\headers5.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\isnt.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\list.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\loclang.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\log.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\match.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\model.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\openmpt.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\openmpt-callback.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\options.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\os.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\pathfn.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\qopen.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rar.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rardefs.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rarlang.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\raros.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rartypes.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rarvm.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rawread.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rdwrfn.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\recvol.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\resource.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rijndael.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rs.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\rs16.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\savepos.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\scantree.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\secpassword.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\sha1.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\sha256.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\smallfn.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\strfn.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\strlist.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\suballoc.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\system.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\threadpool.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\timefn.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\ulinks.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\ui.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\unicode.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\unpack.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\version.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- <ClInclude Include="..\..\include\unrar\volume.hpp">
- <Filter>include\unrar</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\include\unrar\archive.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\arcread.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\blake2s.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\cmddata.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\consio.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\crc.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\crypt.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\encname.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\errhnd.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\extinfo.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\extract.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\filcreat.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\file.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\filefn.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\filestr.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\find.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\getbits.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\global.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\hash.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\headers.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\isnt.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\list.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\match.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\options.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\pathfn.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\qopen.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rar.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rarpch.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rarvm.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rawread.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rdwrfn.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\recvol.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\resource.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rijndael.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rs.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\rs16.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\scantree.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\secpassword.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\sha1.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\sha256.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\smallfn.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\strfn.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\strlist.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\system.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\threadpool.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\timefn.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\ui.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\unicode.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\unpack.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- <ClCompile Include="..\..\include\unrar\volume.cpp">
- <Filter>include\unrar</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
Deleted: trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj.user
===================================================================
--- trunk/OpenMPT/build/gen/UnRAR.vcxproj.user 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/vs2008-ext/UnRAR.vcxproj.user 2015-04-26 10:29:53 UTC (rev 5006)
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
Deleted: trunk/OpenMPT/build/vs2008-ext/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/gen/flac.vcxproj 2015-04-26 09:10:29 UTC (rev 5005)
+++ trunk/OpenMPT/build/vs2008-ext/flac.vcxproj 2015-04-26 10:29:53 UTC (rev 5006)
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseNoLTCG|Win32">
- <Configuration>ReleaseNoLTCG</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseNoLTCG|x64">
- <Configuration>ReleaseNoLTCG</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}</ProjectGuid>
- <RootNamespace>flac</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <UseDebugLibraries>true</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <UseDebugLibraries>true</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <UseDebugLibraries>false</UseDebugLibraries>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\x32\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\flac\x32\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lib\x64\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\obj\flac\x64\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\x32\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\flac\x32\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lib\x64\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\obj\flac\x64\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\lib\x32\ReleaseNoLTCG\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\obj\flac\x32\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">flac</TargetName>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\lib\x64\ReleaseNoLTCG\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\obj\flac\x64\ReleaseNoLTCG\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader></PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitio...
[truncated message content] |
|
From: <man...@us...> - 2015-04-26 13:02:46
|
Revision: 5007
http://sourceforge.net/p/modplug/code/5007
Author: manxorist
Date: 2015-04-26 13:02:39 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
[Mod] build: Do not generate libopenmpt manpages with doxygen. They were never installed properly anyway. html documentation should be sufficient.
Modified Paths:
--------------
trunk/OpenMPT/Makefile
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/build/autotools/configure.ac
trunk/OpenMPT/libopenmpt/Doxyfile
Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile 2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/Makefile 2015-04-26 13:02:39 UTC (rev 5007)
@@ -706,8 +706,6 @@
ifeq ($(MPT_WITH_DOXYGEN),1)
$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/html/
$(INSTALL_DATA_DIR) bin/docs/html $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/html
- $(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/share/doc/man/
- #$(INSTALL_DATA_DIR) bin/docs/man $(DESTDIR)$(PREFIX)/share/man
endif
.PHONY: install-openmpt-modplug
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2015-04-26 13:02:39 UTC (rev 5007)
@@ -475,7 +475,6 @@
man1_MANS = man/openmpt123.1
-#$(man3_MANS): doxygen-doc
MOSTLYCLEANFILES += $(DX_CLEANFILES)
if DX_COND_doc
@@ -491,7 +490,6 @@
clean-local:
$(RM) -r html
- $(RM) -r man
$(RM) @DX_DOCDIR@/@PACKAGE@.tag
uninstall-local:
@@ -501,10 +499,6 @@
DX_CLEAN_HTML = @DX_DOCDIR@/html
endif DX_COND_html
-if DX_COND_man
-DX_CLEAN_MAN = @DX_DOCDIR@/man
-endif DX_COND_man
-
.PHONY: doxygen-run doxygen-doc
.INTERMEDIATE: doxygen-run
@@ -518,7 +512,7 @@
$(DX_ENV) $(DX_DOXYGEN) $(DX_CONFIG)
touch $@
-DX_CLEANFILES = @DX_DOCDIR@/@PACKAGE@.tag -r $(DX_CLEAN_HTML) $(DX_CLEAN_MAN)
+DX_CLEANFILES = @DX_DOCDIR@/@PACKAGE@.tag -r $(DX_CLEAN_HTML)
endif DX_COND_doc
Modified: trunk/OpenMPT/build/autotools/configure.ac
===================================================================
--- trunk/OpenMPT/build/autotools/configure.ac 2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/build/autotools/configure.ac 2015-04-26 13:02:39 UTC (rev 5007)
@@ -128,8 +128,8 @@
DX_DOXYGEN_FEATURE(ON)
DX_DOT_FEATURE(OFF)
DX_HTML_FEATURE(ON)
-DX_MAN_FEATURE(ON)
+DX_MAN_FEATURE(OFF)
DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF)
DX_RTF_FEATURE(OFF)
Modified: trunk/OpenMPT/libopenmpt/Doxyfile
===================================================================
--- trunk/OpenMPT/libopenmpt/Doxyfile 2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/libopenmpt/Doxyfile 2015-04-26 13:02:39 UTC (rev 5007)
@@ -1756,7 +1756,7 @@
# classes and files.
# The default value is: NO.
-GENERATE_MAN = YES
+GENERATE_MAN = NO
# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-30 10:46:59
|
Revision: 5021
http://sourceforge.net/p/modplug/code/5021
Author: manxorist
Date: 2015-04-30 10:46:52 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
[Ref] Deprecate the old printf based logging API. Resolve resulting warnings in soundlib/.
[Ref] Reverse the order of logging levels. Higher numbers now correspond to more verbose logging.
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.h
trunk/OpenMPT/common/typedefs.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Reporting.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp
trunk/OpenMPT/soundlib/tuning.cpp
Modified: trunk/OpenMPT/common/Logging.h
===================================================================
--- trunk/OpenMPT/common/Logging.h 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/common/Logging.h 2015-04-30 10:46:52 UTC (rev 5021)
@@ -15,11 +15,11 @@
enum LogLevel
{
- /*LogDebug = 1,*/
- LogNotification = 2,
+ LogDebug = 5,
+ LogNotification = 4,
LogInformation = 3,
- LogWarning = 4,
- LogError = 5
+ LogWarning = 2,
+ LogError = 1
};
@@ -31,6 +31,7 @@
case LogWarning: return MPT_USTRING("warning"); break;
case LogInformation: return MPT_USTRING("info"); break;
case LogNotification: return MPT_USTRING("notify"); break;
+ case LogDebug: return MPT_USTRING("debug"); break;
}
return MPT_USTRING("unknown");
}
@@ -82,9 +83,9 @@
const Context &context;
public:
Logger(const Context &context) : context(context) {}
- void MPT_PRINTF_FUNC(2,3) operator () (const char *format, ...);
+ MPT_DEPRECATED void MPT_PRINTF_FUNC(2,3) operator () (const char *format, ...); // migrate to type-safe version below, preferably to the one with loglevel
+ /* MPT_DEPRECATED */ void operator () (const AnyStringLocale &text);
void operator () (LogLevel level, const mpt::ustring &text);
- void operator () (const AnyStringLocale &text);
};
#define Log mpt::log::Logger(MPT_LOG_CURRENTCONTEXT())
@@ -95,8 +96,8 @@
{
public:
inline void MPT_PRINTF_FUNC(2,3) operator () (const char * /*format*/, ...) {}
+ inline void operator () (const AnyStringLocale & /*text*/ ) {}
inline void operator () (LogLevel /*level*/ , const mpt::ustring & /*text*/ ) {}
- inline void operator () (const AnyStringLocale & /*text*/ ) {}
};
#define Log if(true) {} else mpt::log::Logger() // completely compile out arguments to Log() so that they do not even get evaluated
Modified: trunk/OpenMPT/common/typedefs.cpp
===================================================================
--- trunk/OpenMPT/common/typedefs.cpp 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/common/typedefs.cpp 2015-04-30 10:46:52 UTC (rev 5021)
@@ -23,10 +23,14 @@
{
if(msg)
{
- mpt::log::Logger(mpt::log::Context(file, line, function))("ASSERTION FAILED: %s (%s)", msg, expr);
+ mpt::log::Logger(mpt::log::Context(file, line, function))(LogError,
+ MPT_USTRING("ASSERTION FAILED: ") + mpt::ToUnicode(mpt::CharsetASCII, msg) + MPT_USTRING(" (") + mpt::ToUnicode(mpt::CharsetASCII, expr) + MPT_USTRING(")")
+ );
} else
{
- mpt::log::Logger(mpt::log::Context(file, line, function))("ASSERTION FAILED: %s", expr);
+ mpt::log::Logger(mpt::log::Context(file, line, function))(LogError,
+ MPT_USTRING("ASSERTION FAILED: ") + mpt::ToUnicode(mpt::CharsetASCII, expr)
+ );
}
}
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2015-04-30 10:46:52 UTC (rev 5021)
@@ -882,7 +882,10 @@
m_Log.push_back(LogEntry(level, text));
} else
{
- Reporting::Message(level, text);
+ if(level < LogDebug)
+ {
+ Reporting::Message(level, text);
+ }
}
}
@@ -904,9 +907,10 @@
//--------------------------------------
{
LogLevel retval = LogNotification;
+ // find the most severe loglevel
for(std::vector<LogEntry>::const_iterator i=m_Log.begin(); i!=m_Log.end(); ++i)
{
- retval = std::max(retval, i->level);
+ retval = std::min(retval, i->level);
}
return retval;
}
@@ -932,10 +936,14 @@
if(!parent) parent = CMainFrame::GetMainFrame();
if(GetLog().size() > 0)
{
- std::wstring text = preamble + mpt::ToWide(GetLogString());
- std::wstring actualTitle = (title.length() == 0) ? MAINFRAME_TITLEW : title;
- Reporting::Message(GetMaxLogLevel(), text, actualTitle, parent);
- return IDOK;
+ LogLevel level = GetMaxLogLevel();
+ if(level < LogDebug)
+ {
+ std::wstring text = preamble + mpt::ToWide(GetLogString());
+ std::wstring actualTitle = (title.length() == 0) ? MAINFRAME_TITLEW : title;
+ Reporting::Message(level, text, actualTitle, parent);
+ return IDOK;
+ }
}
return IDCANCEL;
}
Modified: trunk/OpenMPT/mptrack/Reporting.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Reporting.cpp 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/mptrack/Reporting.cpp 2015-04-30 10:46:52 UTC (rev 5021)
@@ -47,6 +47,7 @@
result = GetTitle() + std::wstring(L" - ");
switch(level)
{
+ case LogDebug: result += L"Debug"; break;
case LogNotification: result += L"Notification"; break;
case LogInformation: result += L"Information"; break;
case LogWarning: result += L"Warning"; break;
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2015-04-30 10:46:52 UTC (rev 5021)
@@ -659,7 +659,7 @@
} else
{
#ifdef DEBUG
- Log("J2B: Unknown command: 0x%X, param 0x%X", m.command, m.param);
+ Log(mpt::String::Print("J2B: Unknown command: 0x%1, param 0x%2", mpt::fmt::HEX0<2>(m.command), mpt::fmt::HEX0<2>(m.param)));
#endif // DEBUG
m.command = CMD_NONE;
}
Modified: trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp
===================================================================
--- trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp 2015-04-30 10:46:52 UTC (rev 5021)
@@ -297,7 +297,7 @@
|| FAILED(m_pMediaObject->SetOutputType(0, &mt, 0)))
{
#ifdef DMO_LOG
- Log("DMO: Failed to set I/O media type\n");
+ Log(MPT_USTRING("DMO: Failed to set I/O media type"));
#endif
return -1;
}
@@ -543,11 +543,11 @@
return (p) ? p->GetEffect() : nullptr;
}
#ifdef DMO_LOG
- Log("%s: Unable to use this DMO\n", lib.libraryName);
+ Log(lib.libraryName.ToUnicode() + MPT_USTRING(": Unable to use this DMO"));
#endif
}
#ifdef DMO_LOG
- else Log("%s: Failed to get IMediaObject & IMediaObjectInPlace interfaces\n", lib.libraryName);
+ else Log(lib.libraryName.ToUnicode() + MPT_USTRING(": Failed to get IMediaObject & IMediaObjectInPlace interfaces"));
#endif
if (pMO) pMO->Release();
if (pMOIP) pMOIP->Release();
Modified: trunk/OpenMPT/soundlib/tuning.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuning.cpp 2015-04-29 16:32:38 UTC (rev 5020)
+++ trunk/OpenMPT/soundlib/tuning.cpp 2015-04-30 10:46:52 UTC (rev 5021)
@@ -406,12 +406,10 @@
if (pTuning->ProProcessUnserializationdata())
{
#ifdef MODPLUG_TRACKER
- Reporting::Error(
+ Reporting::Error(("Processing loaded data for tuning \"" + pTuning->GetName() + "\" failed.").c_str(), "Tuning load failure");
#else
- Log("%s (%s)\n",
+ Log(LogError, MPT_USTRING("Processing loaded data for tuning \"") + mpt::ToUnicode(mpt::CharsetISO8859_1, pTuning->GetName()) + MPT_USTRING("\" failed."));
#endif
- ("Processing loaded data for tuning \"" + pTuning->GetName() + "\" failed.").c_str(), "Tuning load failure"
- );
delete pTuning; pTuning = nullptr;
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-04-30 12:49:13
|
Revision: 5025
http://sourceforge.net/p/modplug/code/5025
Author: manxorist
Date: 2015-04-30 12:49:08 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
[Ref] Silence stupid non-virtual destructor warnings with older GCC.
Modified Paths:
--------------
trunk/OpenMPT/common/Logging.h
trunk/OpenMPT/soundlib/Sndfile.h
Modified: trunk/OpenMPT/common/Logging.h
===================================================================
--- trunk/OpenMPT/common/Logging.h 2015-04-30 11:24:53 UTC (rev 5024)
+++ trunk/OpenMPT/common/Logging.h 2015-04-30 12:49:08 UTC (rev 5025)
@@ -39,6 +39,8 @@
class ILog
{
+protected:
+ virtual ~ILog() { }
public:
virtual void AddToLog(LogLevel level, const mpt::ustring &text) const = 0;
};
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2015-04-30 11:24:53 UTC (rev 5024)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2015-04-30 12:49:08 UTC (rev 5025)
@@ -268,6 +268,8 @@
class IAudioReadTarget
{
+protected:
+ virtual ~IAudioReadTarget() { }
public:
virtual void DataCallback(int *MixSoundBuffer, std::size_t channels, std::size_t countChunk) = 0;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-05-03 08:30:30
|
Revision: 5033
http://sourceforge.net/p/modplug/code/5033
Author: manxorist
Date: 2015-05-03 08:30:16 +0000 (Sun, 03 May 2015)
Log Message:
-----------
[Var] ogg: Add the full libogg 1.3.2 instead of just the public header files. It contains only 2 .c files anyway.
[Ref] Stream export: Remove dynamic loading code for external libogg in Vorbis and Opus exporters.
[Mod] build: Build libFLAC with libogg support.
[New] FLAC: Support loading OggFlac files and add the .oga extension to the appropriate file open dialogs.
[Mod] OpenMPT: Version is now 1.25.00.03
Modified Paths:
--------------
trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua
trunk/OpenMPT/build/premake4.lua
trunk/OpenMPT/build/vs2008/openmpt123.sln
trunk/OpenMPT/build/vs2008/openmpt123.vcproj
trunk/OpenMPT/build/vs2008-ext/flac.vcproj
trunk/OpenMPT/build/vs2010/openmpt123.sln
trunk/OpenMPT/build/vs2010/openmpt123.vcxproj
trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters
trunk/OpenMPT/build/vs2010-ext/flac.vcxproj
trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters
trunk/OpenMPT/common/BuildSettings.h
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/MPTRACK_10.sln
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/openmpt123/openmpt123.sln
trunk/OpenMPT/openmpt123/openmpt123.vcxproj
trunk/OpenMPT/soundlib/SampleFormats.cpp
Added Paths:
-----------
trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua
trunk/OpenMPT/build/vs2008-ext/ogg.vcproj
trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj
trunk/OpenMPT/build/vs2010-ext/ogg.vcxproj.filters
trunk/OpenMPT/include/ogg/AUTHORS
trunk/OpenMPT/include/ogg/CHANGES
trunk/OpenMPT/include/ogg/COPYING
trunk/OpenMPT/include/ogg/OpenMPT.txt
trunk/OpenMPT/include/ogg/README
trunk/OpenMPT/include/ogg/include/
trunk/OpenMPT/include/ogg/include/ogg/
trunk/OpenMPT/include/ogg/include/ogg/ogg.h
trunk/OpenMPT/include/ogg/include/ogg/os_types.h
trunk/OpenMPT/include/ogg/src/
trunk/OpenMPT/include/ogg/src/bitwise.c
trunk/OpenMPT/include/ogg/src/framing.c
trunk/OpenMPT/include/ogg/win32/
trunk/OpenMPT/include/ogg/win32/ogg.def
Removed Paths:
-------------
trunk/OpenMPT/include/ogg/ogg.h
trunk/OpenMPT/include/ogg/os_types.h
Property Changed:
----------------
trunk/OpenMPT/include/ogg/
Modified: trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/premake4-win/ext-flac.premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -4,7 +4,7 @@
language "C"
location ( "../../build/" .. _ACTION .. "-ext" )
objdir "../../build/obj/flac"
- includedirs { "../../include/flac/include", "../../include/flac/src/libFLAC/include" }
+ includedirs { "../../include/flac/include", "../../include/flac/src/libFLAC/include", "../../include/ogg/include" }
files {
"../../include/flac/src/libFLAC/bitmath.c",
"../../include/flac/src/libFLAC/bitreader.c",
@@ -25,6 +25,10 @@
"../../include/flac/src/libFLAC/memory.c",
"../../include/flac/src/libFLAC/metadata_iterators.c",
"../../include/flac/src/libFLAC/metadata_object.c",
+ "../../include/flac/src/libFLAC/ogg_decoder_aspect.c",
+ "../../include/flac/src/libFLAC/ogg_encoder_aspect.c",
+ "../../include/flac/src/libFLAC/ogg_helper.c",
+ "../../include/flac/src/libFLAC/ogg_mapping.c",
"../../include/flac/src/libFLAC/stream_decoder.c",
"../../include/flac/src/libFLAC/stream_encoder.c",
"../../include/flac/src/libFLAC/stream_encoder_intrin_avx2.c",
@@ -50,6 +54,10 @@
"../../include/flac/src/libFLAC/include/private/md5.h",
"../../include/flac/src/libFLAC/include/private/memory.h",
"../../include/flac/src/libFLAC/include/private/metadata.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_decoder_aspect.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_encoder_aspect.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_helper.h",
+ "../../include/flac/src/libFLAC/include/private/ogg_mapping.h",
"../../include/flac/src/libFLAC/include/private/stream_encoder.h",
"../../include/flac/src/libFLAC/include/private/stream_encoder_framing.h",
"../../include/flac/src/libFLAC/include/private/window.h",
@@ -69,7 +77,7 @@
"../../include/flac/include/FLAC/stream_encoder.h",
}
buildoptions { "/wd4244", "/wd4267", "/wd4334" }
- defines { "FLAC__NO_DLL" }
+ defines { "FLAC__NO_DLL", "FLAC__HAS_OGG=1" }
configuration "vs2010"
defines { "VERSION=\"1.3.1\"" }
configuration "vs2008"
Added: trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua (rev 0)
+++ trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -0,0 +1,15 @@
+
+ project "ogg"
+ uuid "d8d5e11c-f959-49ef-b741-b3f6de52ded8"
+ language "C"
+ location ( "../../build/" .. _ACTION .. "-ext" )
+ objdir "../../build/obj/ogg"
+ includedirs { "../../include/ogg/include" }
+ files {
+ "../../include/ogg/include/ogg/ogg.h",
+ "../../include/ogg/include/ogg/os_types.h",
+ "../../include/ogg/src/bitwise.c",
+ "../../include/ogg/src/framing.c",
+ }
+ dofile "../../build/premake4-win/premake4-defaults-LIB.lua"
+ dofile "../../build/premake4-win/premake4-defaults-static.lua"
Property changes on: trunk/OpenMPT/build/premake4-win/ext-ogg.premake4.lua
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-lua
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/premake4-win/mpt-openmpt123.premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -22,6 +22,7 @@
"libopenmpt",
"miniz",
"flac",
+ "ogg",
"portaudio",
"ksuser",
"winmm",
Modified: trunk/OpenMPT/build/premake4.lua
===================================================================
--- trunk/OpenMPT/build/premake4.lua 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/premake4.lua 2015-05-03 08:30:16 UTC (rev 5033)
@@ -176,6 +176,7 @@
dofile "../build/premake4-win/mpt-libopenmpt.premake4.lua"
dofile "../build/premake4-win/ext-flac.premake4.lua"
dofile "../build/premake4-win/ext-miniz.premake4.lua"
+ dofile "../build/premake4-win/ext-ogg.premake4.lua"
dofile "../build/premake4-win/ext-portaudio.premake4.lua"
end
@@ -192,6 +193,7 @@
dofile "../build/premake4-win/ext-miniz.premake4.lua"
dofile "../build/premake4-win/ext-miniz-shared.premake4.lua"
dofile "../build/premake4-win/ext-minizip.premake4.lua"
+ dofile "../build/premake4-win/ext-ogg.premake4.lua"
dofile "../build/premake4-win/ext-portaudio.premake4.lua"
dofile "../build/premake4-win/ext-portmidi.premake4.lua"
dofile "../build/premake4-win/ext-pugixml.premake4.lua"
Modified: trunk/OpenMPT/build/vs2008/openmpt123.sln
===================================================================
--- trunk/OpenMPT/build/vs2008/openmpt123.sln 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2008/openmpt123.sln 2015-05-03 08:30:16 UTC (rev 5033)
@@ -6,6 +6,7 @@
{9C5101EF-3E20-4558-809B-277FDD50E878} = {9C5101EF-3E20-4558-809B-277FDD50E878}
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5} = {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8} = {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}
{189B867F-FF4B-45A1-B741-A97492EE69AF} = {189B867F-FF4B-45A1-B741-A97492EE69AF}
EndProjectSection
EndProject
@@ -18,6 +19,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "..\vs2008-ext\miniz.vcproj", "{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "..\vs2008-ext\ogg.vcproj", "{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\vs2008-ext\portaudio.vcproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
EndProject
Global
@@ -60,6 +63,14 @@
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.Build.0 = Release|Win32
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.ActiveCfg = Release|x64
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.Build.0 = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64
Modified: trunk/OpenMPT/build/vs2008/openmpt123.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/openmpt123.vcproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2008/openmpt123.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x32\Debug\libopenmpt.lib ..\lib\x32\Debug\miniz.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x32\Debug\libopenmpt.lib ..\lib\x32\Debug\miniz.lib ..\lib\x32\Debug\flac.lib ..\lib\x32\Debug\ogg.lib ..\lib\x32\Debug\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -153,7 +153,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x64\Debug\libopenmpt.lib ..\lib\x64\Debug\miniz.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x64\Debug\libopenmpt.lib ..\lib\x64\Debug\miniz.lib ..\lib\x64\Debug\flac.lib ..\lib\x64\Debug\ogg.lib ..\lib\x64\Debug\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -238,7 +238,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x32\Release\libopenmpt.lib ..\lib\x32\Release\miniz.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x32\Release\libopenmpt.lib ..\lib\x32\Release\miniz.lib ..\lib\x32\Release\flac.lib ..\lib\x32\Release\ogg.lib ..\lib\x32\Release\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -326,7 +326,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\lib\x64\Release\libopenmpt.lib ..\lib\x64\Release\miniz.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\portaudio.lib ksuser.lib winmm.lib"
+ AdditionalDependencies="..\lib\x64\Release\libopenmpt.lib ..\lib\x64\Release\miniz.lib ..\lib\x64\Release\flac.lib ..\lib\x64\Release\ogg.lib ..\lib\x64\Release\portaudio.lib ksuser.lib winmm.lib"
OutputFile="$(OutDir)\openmpt123.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
Modified: trunk/OpenMPT/build/vs2008-ext/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008-ext/flac.vcproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2008-ext/flac.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -44,8 +44,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -61,8 +61,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -123,8 +123,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334"
Optimization="0"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -140,8 +140,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -201,8 +201,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -218,8 +218,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -280,8 +280,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -297,8 +297,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -358,8 +358,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -375,8 +375,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -437,8 +437,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4244 /wd4267 /wd4334 /GL- /MP"
Optimization="3"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -454,8 +454,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
- AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include"
+ PreprocessorDefinitions="FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION=\"1.3.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -570,6 +570,22 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_decoder_aspect.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_encoder_aspect.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_helper.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\include\private\ogg_mapping.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h"
>
</File>
@@ -677,6 +693,22 @@
>
</File>
<File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_decoder_aspect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_encoder_aspect.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_helper.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\flac\src\libFLAC\ogg_mapping.c"
+ >
+ </File>
+ <File
RelativePath="..\..\include\flac\src\libFLAC\stream_decoder.c"
>
</File>
Added: trunk/OpenMPT/build/vs2008-ext/ogg.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008-ext/ogg.vcproj (rev 0)
+++ trunk/OpenMPT/build/vs2008-ext/ogg.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="ogg"
+ ProjectGUID="{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+ RootNamespace="ogg"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib\x32\Debug"
+ IntermediateDirectory="..\obj\ogg\x32\Debug"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="..\lib\x64\Debug"
+ IntermediateDirectory="..\obj\ogg\x64\Debug"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\lib\x32\Release"
+ IntermediateDirectory="..\obj\ogg\x32\Release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="..\lib\x64\Release"
+ IntermediateDirectory="..\obj\ogg\x64\Release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="ReleaseNoLTCG|Win32"
+ OutputDirectory="..\lib\x32\ReleaseNoLTCG"
+ IntermediateDirectory="..\obj\ogg\x32\ReleaseNoLTCG"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/GL- /MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="0"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="ReleaseNoLTCG|x64"
+ OutputDirectory="..\lib\x64\ReleaseNoLTCG"
+ IntermediateDirectory="..\obj\ogg\x64\ReleaseNoLTCG"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/GL- /MP"
+ Optimization="3"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ ProgramDataBaseFileName="$(OutDir)\ogg.pdb"
+ DebugInformationFormat="0"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..\include\ogg\include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ogg.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="include"
+ Filter=""
+ >
+ <Filter
+ Name="ogg"
+ Filter=""
+ >
+ <Filter
+ Name="include"
+ Filter=""
+ >
+ <Filter
+ Name="ogg"
+ Filter=""
+ >
+ <File
+ RelativePath="..\..\include\ogg\include\ogg\ogg.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\ogg\include\ogg\os_types.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="src"
+ Filter=""
+ >
+ <File
+ RelativePath="..\..\include\ogg\src\bitwise.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\ogg\src\framing.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/OpenMPT/build/vs2008-ext/ogg.vcproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-vcproj
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Modified: trunk/OpenMPT/build/vs2010/openmpt123.sln
===================================================================
--- trunk/OpenMPT/build/vs2010/openmpt123.sln 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010/openmpt123.sln 2015-05-03 08:30:16 UTC (rev 5033)
@@ -6,6 +6,7 @@
{9C5101EF-3E20-4558-809B-277FDD50E878} = {9C5101EF-3E20-4558-809B-277FDD50E878}
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5} = {E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8} = {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}
{189B867F-FF4B-45A1-B741-A97492EE69AF} = {189B867F-FF4B-45A1-B741-A97492EE69AF}
EndProjectSection
EndProject
@@ -18,6 +19,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "..\vs2010-ext\miniz.vcxproj", "{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "..\vs2010-ext\ogg.vcxproj", "{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\vs2010-ext\portaudio.vcxproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
EndProject
Global
@@ -60,6 +63,14 @@
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.Build.0 = Release|Win32
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.ActiveCfg = Release|x64
{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|x64.Build.0 = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = Debug|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = Debug|x64
Modified: trunk/OpenMPT/build/vs2010/openmpt123.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/openmpt123.vcxproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010/openmpt123.vcxproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -99,7 +99,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x32\Debug\libopenmpt.lib;..\lib\x32\Debug\miniz.lib;..\lib\x32\Debug\flac.lib;..\lib\x32\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x32\Debug\libopenmpt.lib;..\lib\x32\Debug\miniz.lib;..\lib\x32\Debug\flac.lib;..\lib\x32\Debug\ogg.lib;..\lib\x32\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
@@ -130,7 +130,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x64\Debug\libopenmpt.lib;..\lib\x64\Debug\miniz.lib;..\lib\x64\Debug\flac.lib;..\lib\x64\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x64\Debug\libopenmpt.lib;..\lib\x64\Debug\miniz.lib;..\lib\x64\Debug\flac.lib;..\lib\x64\Debug\ogg.lib;..\lib\x64\Debug\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
@@ -163,7 +163,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x32\Release\libopenmpt.lib;..\lib\x32\Release\miniz.lib;..\lib\x32\Release\flac.lib;..\lib\x32\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x32\Release\libopenmpt.lib;..\lib\x32\Release\miniz.lib;..\lib\x32\Release\flac.lib;..\lib\x32\Release\ogg.lib;..\lib\x32\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
@@ -198,7 +198,7 @@
<AdditionalIncludeDirectories>..\..;..\..\openmpt123;..\..\include\flac\include;..\..\include\portaudio\include;$(IntDir)\svn_version;..\svn_version;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\lib\x64\Release\libopenmpt.lib;..\lib\x64\Release\miniz.lib;..\lib\x64\Release\flac.lib;..\lib\x64\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\lib\x64\Release\libopenmpt.lib;..\lib\x64\Release\miniz.lib;..\lib\x64\Release\flac.lib;..\lib\x64\Release\ogg.lib;..\lib\x64\Release\portaudio.lib;ksuser.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)openmpt123.exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
Modified: trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010/openmpt123.vcxproj.filters 2015-05-03 08:30:16 UTC (rev 5033)
@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="openmpt123">
- <UniqueIdentifier>{36BC9D47-3BB6-D647-8302-CDBA8C0F4B23}</UniqueIdentifier>
+ <UniqueIdentifier>{CF1D4909-84D9-DB4E-A32B-526855292C75}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Modified: trunk/OpenMPT/build/vs2010-ext/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010-ext/flac.vcxproj 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010-ext/flac.vcxproj 2015-05-03 08:30:16 UTC (rev 5033)
@@ -113,8 +113,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -125,8 +125,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -141,8 +141,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -153,8 +153,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -169,8 +169,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -182,8 +182,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -200,8 +200,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -213,8 +213,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -231,8 +231,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -244,8 +244,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -261,8 +261,8 @@
<ClCompile>
<AdditionalOptions>/wd4244 /wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -274,8 +274,8 @@
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
- <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>FLAC__NO_DLL;FLAC__HAS_OGG=1;VERSION="1.3.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\include\flac\include;..\..\include\flac\src\libFLAC\include;..\..\include\ogg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)flac.lib</OutputFile>
@@ -301,6 +301,10 @@
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\md5.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\memory.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\metadata.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_decoder_aspect.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_encoder_aspect.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_helper.h" />
+ <ClInclude Include="..\..\include\flac\src\libFLAC\include\private\ogg_mapping.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\stream_encoder_framing.h" />
<ClInclude Include="..\..\include\flac\src\libFLAC\include\private\window.h" />
@@ -356,6 +360,14 @@
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\metadata_object.c">
</ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_decoder_aspect.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_encoder_aspect.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_helper.c">
+ </ClCompile>
+ <ClCompile Include="..\..\include\flac\src\libFLAC\ogg_mapping.c">
+ </ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_decoder.c">
</ClCompile>
<ClCompile Include="..\..\include\flac\src\libFLAC\stream_encoder.c">
Modified: trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters 2015-05-02 18:10:24 UTC (rev 5032)
+++ trunk/OpenMPT/build/vs2010-ext/flac.vcxproj.filters 2015-05-03 08:30:16 UTC (rev 5033)
@@ -2,37 +2,37 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
- <UniqueIdentifier>{477C8603-F00B-2548-A767-80645328275F}</UniqueIdentifier>
+ <UniqueIdentifier>{6669F788-380B-1B4D-A4F3-04EEB5A94E32}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac">
- <UniqueIdentifier>{FB8083B0-F94E-BC42-9611-97668E17BB3F}</UniqueIdentifier>
+ <UniqueIdentifier>{549D34D9-CACC-3E45-A67D-36050400B29E}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src">
- <UniqueIdentifier>{A78D6E10-3207-DE4C-ABF4-20FEA738D089}</UniqueIdentifier>
+ <UniqueIdentifier>{5C09BD43-A463-CC4D-8272-D1116445D621}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC">
- <UniqueIdentifier>{F344F723-2860-1B47-96CF-BED27AB2FAA8}</UniqueIdentifier>
+ <UniqueIdentifier>{20FE52D8-0F04-F149-80CC-A6C0DF9A5D6D}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include">
- <UniqueIdentifier>{8F36D088-C9F7-E341-90AA-19E71FC3C951}</UniqueIdentifier>
+ <UniqueIdentifier>{298BE21E-5DD0-B248-AB54-42D22A72A60F}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\private">
- <UniqueIdentifier>{3BB747A3-CD90-2B46-907B-473C1459D681}</UniqueIdentifier>
+ <UniqueIdentifier>{1E557C2C-9A6A-2B4B-8472-07EFA30FC503}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\libFLAC\include\protected">
- <UniqueIdentifier>{02E621ED-7A70-104A-9D42-AB256A5BFAC2}</UniqueIdentifier>
+ <UniqueIdentifier>{5807E4EA-A6AD-3F4D-B661-7D4346350C72}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include">
- <UniqueIdentifier>{44D88C36-692F-1B49-BD6A-0DB1570A6EDD}</UniqueIdentifier>
+ <UniqueIdentifier>{772B6428-08A9-4942-BE5A-0F3F5D8C4A79}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\include\FLAC">
- <UniqueIdentifier>{8026CF0C-4EEF-FF4B-A3F7-2BE4A5E84820}</UniqueIdentifier>
+ <UniqueIdentifier>{39DC99E4-1018-B54D-A39B-2A4C1E941BDA}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\share">
- <UniqueIdentifier>{4F49EEEE-0FD6-A34D-A515-E76D63A4EA2B}</UniqueIdentifier>
+ <UniqueIdentifier>{0ED27C4A-47A1-E146-A272-8E74C242242F}</UniqueIdentifier>
</Filter>
<Filter Include="include\flac\src\share\win_utf8_io">
- <UniqueIdentifier>{CFB3088D-B183...
[truncated message content] |
|
From: <man...@us...> - 2015-05-03 08:45:20
|
Revision: 5034
http://sourceforge.net/p/modplug/code/5034
Author: manxorist
Date: 2015-05-03 08:45:14 +0000 (Sun, 03 May 2015)
Log Message:
-----------
[Fix] build: Update VS2008 project.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MPTRACK_08.sln
trunk/OpenMPT/mptrack/mptrack_08.vcproj
Property Changed:
----------------
trunk/OpenMPT/build/vs2008/
trunk/OpenMPT/build/vs2008-ext/
Index: trunk/OpenMPT/build/vs2008
===================================================================
--- trunk/OpenMPT/build/vs2008 2015-05-03 08:30:16 UTC (rev 5033)
+++ trunk/OpenMPT/build/vs2008 2015-05-03 08:45:14 UTC (rev 5034)
Property changes on: trunk/OpenMPT/build/vs2008
___________________________________________________________________
Modified: svn:ignore
## -2,3 +2,4 ##
*.ncb
*.suo
Release
+*.user
Index: trunk/OpenMPT/build/vs2008-ext
===================================================================
--- trunk/OpenMPT/build/vs2008-ext 2015-05-03 08:30:16 UTC (rev 5033)
+++ trunk/OpenMPT/build/vs2008-ext 2015-05-03 08:45:14 UTC (rev 5034)
Property changes on: trunk/OpenMPT/build/vs2008-ext
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*.user
Modified: trunk/OpenMPT/mptrack/MPTRACK_08.sln
===================================================================
--- trunk/OpenMPT/mptrack/MPTRACK_08.sln 2015-05-03 08:30:16 UTC (rev 5033)
+++ trunk/OpenMPT/mptrack/MPTRACK_08.sln 2015-05-03 08:45:14 UTC (rev 5034)
@@ -3,6 +3,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mptrack", "mptrack_08.vcproj", "{21D95071-FB97-4E69-B3B1-050D0D4A5021}"
ProjectSection(ProjectDependencies) = postProject
{1654FB18-FDE6-406F-9D84-BA12BFBD67B2} = {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8} = {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}
{63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7} = {63AF9025-A6CE-4147-A05D-6E2CCFD3A0D7}
{BC116B29-9958-4389-B294-7529BB7C7D37} = {BC116B29-9958-4389-B294-7529BB7C7D37}
{189B867F-FF4B-45A1-B741-A97492EE69AF} = {189B867F-FF4B-45A1-B741-A97492EE69AF}
@@ -31,6 +32,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "r8brain", "..\build\vs2008-ext\r8brain.vcproj", "{BC116B29-9958-4389-B294-7529BB7C7D37}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "..\build\vs2008-ext\ogg.vcproj", "{D8D5E11C-F959-49EF-B741-B3F6DE52DED8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -119,6 +122,14 @@
{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|Win32.Build.0 = Release|Win32
{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.ActiveCfg = Release|x64
{BC116B29-9958-4389-B294-7529BB7C7D37}.Release|x64.Build.0 = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|Win32.Build.0 = Debug|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.ActiveCfg = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Debug|x64.Build.0 = Debug|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.ActiveCfg = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|Win32.Build.0 = Release|Win32
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.ActiveCfg = Release|x64
+ {D8D5E11C-F959-49EF-B741-B3F6DE52DED8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2015-05-03 08:30:16 UTC (rev 5033)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2015-05-03 08:45:14 UTC (rev 5034)
@@ -52,7 +52,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\ogg\include;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -151,7 +151,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\ogg\include;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -252,7 +252,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\ogg\include;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -351,7 +351,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
+ AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\ogg\include;..\include\zlib;..\;"$(IntDir)\svn_version";..\build\svn_version"
PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
StringPooling="true"
ExceptionHandling="2"
@@ -768,15 +768,15 @@
>
</File>
<File
- RelativePath="..\sounddev\SoundDeviceManager.cpp"
+ RelativePath="..\sounddev\SoundDeviceASIO.cpp"
>
</File>
<File
- RelativePath="..\sounddev\SoundDeviceASIO.cpp"
+ RelativePath="..\sounddev\SoundDeviceDirectSound.cpp"
>
</File>
<File
- RelativePath="..\sounddev\SoundDeviceDirectSound.cpp"
+ RelativePath="..\sounddev\SoundDeviceManager.cpp"
>
</File>
<File
@@ -1518,15 +1518,15 @@
>
</File>
<File
- RelativePath="..\sounddev\SoundDeviceManager.h"
+ RelativePath="..\sounddev\SoundDeviceASIO.h"
>
</File>
<File
- RelativePath="..\sounddev\SoundDeviceASIO.h"
+ RelativePath="..\sounddev\SoundDeviceDirectSound.h"
>
</File>
<File
- RelativePath="..\sounddev\SoundDeviceDirectSound.h"
+ RelativePath="..\sounddev\SoundDeviceManager.h"
>
</File>
<File
@@ -1894,11 +1894,11 @@
>
</File>
<File
- RelativePath="..\Soundlib\load_psm.cpp"
+ RelativePath="..\soundlib\load_plm.cpp"
>
</File>
<File
- RelativePath="..\soundlib\load_plm.cpp"
+ RelativePath="..\Soundlib\load_psm.cpp"
>
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-05-03 20:10:27
|
Revision: 5038
http://sourceforge.net/p/modplug/code/5038
Author: manxorist
Date: 2015-05-03 20:10:21 +0000 (Sun, 03 May 2015)
Log Message:
-----------
[Ref] Kill dead code in ComponentManager.
Modified Paths:
--------------
trunk/OpenMPT/common/ComponentManager.cpp
trunk/OpenMPT/common/ComponentManager.h
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
Modified: trunk/OpenMPT/common/ComponentManager.cpp
===================================================================
--- trunk/OpenMPT/common/ComponentManager.cpp 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/common/ComponentManager.cpp 2015-05-03 20:10:21 UTC (rev 5038)
@@ -19,10 +19,9 @@
#if defined(MPT_WITH_DYNBIND)
-ComponentBase::ComponentBase(ComponentType type, bool delayLoaded)
-//----------------------------------------------------------------
+ComponentBase::ComponentBase(ComponentType type)
+//----------------------------------------------
: m_Type(type)
- , m_DelayLoaded(delayLoaded)
, m_Initialized(false)
, m_Available(false)
, m_BindFailed(false)
@@ -119,13 +118,6 @@
}
-bool ComponentBase::IsDelayLoaded() const
-//---------------------------------------
-{
- return m_DelayLoaded;
-}
-
-
bool ComponentBase::IsInitialized() const
//---------------------------------------
{
Modified: trunk/OpenMPT/common/ComponentManager.h
===================================================================
--- trunk/OpenMPT/common/ComponentManager.h 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/common/ComponentManager.h 2015-05-03 20:10:21 UTC (rev 5038)
@@ -63,7 +63,6 @@
virtual std::string GetName() const = 0;
virtual std::string GetSettingsKey() const = 0;
virtual ComponentType GetType() const = 0;
- virtual bool IsDelayLoaded() const = 0; // openmpt is linked against the component dlls which get delay loaded
virtual bool IsInitialized() const = 0; // Initialize() has been called
virtual bool IsAvailable() const = 0; // Initialize() has been successfull
@@ -83,7 +82,6 @@
private:
std::string m_Name;
ComponentType m_Type;
- bool m_DelayLoaded;
bool m_Initialized;
bool m_Available;
@@ -91,10 +89,10 @@
TLibraryMap m_Libraries;
bool m_BindFailed;
-
+
protected:
- ComponentBase(ComponentType type, bool delayLoaded = false);
+ ComponentBase(ComponentType type);
public:
@@ -115,7 +113,6 @@
virtual std::string GetName() const;
virtual ComponentType GetType() const;
- virtual bool IsDelayLoaded() const;
virtual bool IsInitialized() const;
virtual bool IsAvailable() const;
@@ -163,8 +160,8 @@
private:
mpt::PathString m_BaseName;
public:
- ComponentSystemDLL(const mpt::PathString &baseName, bool delayLoaded = false)
- : ComponentBase(ComponentTypeSystem, delayLoaded)
+ ComponentSystemDLL(const mpt::PathString &baseName)
+ : ComponentBase(ComponentTypeSystem)
, m_BaseName(baseName)
{
return;
@@ -177,13 +174,13 @@
};
-class ComponentDelayLoadedBundledDLL : public ComponentBase
+class ComponentBundledDLL : public ComponentBase
{
private:
mpt::PathString m_FullName;
public:
- ComponentDelayLoadedBundledDLL(const mpt::PathString &fullName)
- : ComponentBase(ComponentTypeBundled, true)
+ ComponentBundledDLL(const mpt::PathString &fullName)
+ : ComponentBase(ComponentTypeBundled)
, m_FullName(fullName)
{
return;
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2015-05-03 20:10:21 UTC (rev 5038)
@@ -1813,12 +1813,12 @@
//=======================
class ComponentSoundTouch
//=======================
- : public ComponentDelayLoadedBundledDLL
+ : public ComponentBundledDLL
{
MPT_DECLARE_COMPONENT_MEMBERS
public:
ComponentSoundTouch()
- : ComponentDelayLoadedBundledDLL(MPT_PATHSTRING("OpenMPT_SoundTouch_f32"))
+ : ComponentBundledDLL(MPT_PATHSTRING("OpenMPT_SoundTouch_f32"))
{
return;
}
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2015-05-03 20:10:21 UTC (rev 5038)
@@ -151,7 +151,7 @@
{
MPT_DECLARE_COMPONENT_MEMBERS
public:
- ComponentUXTheme() : ComponentSystemDLL(MPT_PATHSTRING("uxtheme"), true) { }
+ ComponentUXTheme() : ComponentSystemDLL(MPT_PATHSTRING("uxtheme")) { }
std::string GetSettingsKey() const { return "UXTheme"; }
};
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-05-03 20:10:21 UTC (rev 5038)
@@ -329,7 +329,7 @@
public:
ComponentLame()
- : ComponentBase(ComponentTypeForeign, false)
+ : ComponentBase(ComponentTypeForeign)
{
return;
}
@@ -673,7 +673,7 @@
public:
ComponentBlade()
- : ComponentBase(ComponentTypeForeign, false)
+ : ComponentBase(ComponentTypeForeign)
, isLame(false)
{
return;
@@ -946,7 +946,7 @@
public:
ComponentAcmMP3()
- : ComponentBase(ComponentTypeSystemInstallable, false)
+ : ComponentBase(ComponentTypeSystemInstallable)
{
return;
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2015-05-03 20:10:21 UTC (rev 5038)
@@ -65,7 +65,7 @@
public:
ComponentOpus()
- : ComponentBase(ComponentTypeForeign, false)
+ : ComponentBase(ComponentTypeForeign)
{
return;
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-05-03 19:26:44 UTC (rev 5037)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-05-03 20:10:21 UTC (rev 5038)
@@ -69,7 +69,7 @@
public:
ComponentVorbis()
- : ComponentBase(ComponentTypeForeign, false)
+ : ComponentBase(ComponentTypeForeign)
{
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2015-05-03 20:31:14
|
Revision: 5039
http://sourceforge.net/p/modplug/code/5039
Author: manxorist
Date: 2015-05-03 20:31:07 +0000 (Sun, 03 May 2015)
Log Message:
-----------
[Ref] Split dynamic library handling concerns from ComponentBase into a separate ComponentLibrary class.
Modified Paths:
--------------
trunk/OpenMPT/common/ComponentManager.cpp
trunk/OpenMPT/common/ComponentManager.h
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/soundlib/Load_mo3.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
Modified: trunk/OpenMPT/common/ComponentManager.cpp
===================================================================
--- trunk/OpenMPT/common/ComponentManager.cpp 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/common/ComponentManager.cpp 2015-05-03 20:31:07 UTC (rev 5039)
@@ -24,7 +24,6 @@
: m_Type(type)
, m_Initialized(false)
, m_Available(false)
- , m_BindFailed(false)
{
return;
}
@@ -37,6 +36,22 @@
}
+ComponentLibrary::ComponentLibrary(ComponentType type)
+//----------------------------------------------------
+ : ComponentBase(type)
+ , m_BindFailed(false)
+{
+ return;
+}
+
+
+ComponentLibrary::~ComponentLibrary()
+//-----------------------------------
+{
+ return;
+}
+
+
void ComponentBase::SetName(const std::string &name)
//--------------------------------------------------
{
@@ -58,8 +73,8 @@
}
-bool ComponentBase::AddLibrary(const std::string &libName, const mpt::LibraryPath &libPath)
-//-----------------------------------------------------------------------------------------
+bool ComponentLibrary::AddLibrary(const std::string &libName, const mpt::LibraryPath &libPath)
+//--------------------------------------------------------------------------------------------
{
if(m_Libraries[libName].IsValid())
{
@@ -76,29 +91,29 @@
}
-void ComponentBase::ClearLibraries()
-//----------------------------------
+void ComponentLibrary::ClearLibraries()
+//-------------------------------------
{
m_Libraries.clear();
}
-void ComponentBase::SetBindFailed()
-//---------------------------------
+void ComponentLibrary::SetBindFailed()
+//------------------------------------
{
m_BindFailed = true;
}
-void ComponentBase::ClearBindFailed()
-//-----------------------------------
+void ComponentLibrary::ClearBindFailed()
+//--------------------------------------
{
m_BindFailed = false;
}
-bool ComponentBase::HasBindFailed() const
-//---------------------------------------
+bool ComponentLibrary::HasBindFailed() const
+//------------------------------------------
{
return m_BindFailed;
}
@@ -139,8 +154,8 @@
}
-mpt::Library ComponentBase::GetLibrary(const std::string &libName) const
-//----------------------------------------------------------------------
+mpt::Library ComponentLibrary::GetLibrary(const std::string &libName) const
+//-------------------------------------------------------------------------
{
TLibraryMap::const_iterator it = m_Libraries.find(libName);
if(it == m_Libraries.end())
Modified: trunk/OpenMPT/common/ComponentManager.h
===================================================================
--- trunk/OpenMPT/common/ComponentManager.h 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/common/ComponentManager.h 2015-05-03 20:31:07 UTC (rev 5039)
@@ -70,8 +70,6 @@
virtual void Initialize() = 0; // try to load the component
- virtual mpt::Library GetLibrary(const std::string &libName) const = 0;
-
};
@@ -80,15 +78,12 @@
{
private:
+
std::string m_Name;
ComponentType m_Type;
-
+
bool m_Initialized;
bool m_Available;
- typedef std::map<std::string, mpt::Library> TLibraryMap;
- TLibraryMap m_Libraries;
-
- bool m_BindFailed;
protected:
@@ -103,11 +98,6 @@
void SetName(const std::string &name);
void SetInitialized();
void SetAvailable();
- bool AddLibrary(const std::string &libName, const mpt::LibraryPath &libPath);
- void ClearLibraries();
- void SetBindFailed();
- void ClearBindFailed();
- bool HasBindFailed() const;
public:
@@ -115,13 +105,51 @@
virtual ComponentType GetType() const;
virtual bool IsInitialized() const;
virtual bool IsAvailable() const;
-
+
virtual mpt::ustring GetVersion() const;
+
+public:
+
+ virtual void Initialize();
+
+protected:
+
+ virtual bool DoInitialize() = 0;
+
+};
+
+
+class ComponentLibrary
+ : public ComponentBase
+{
+
+private:
+ typedef std::map<std::string, mpt::Library> TLibraryMap;
+ TLibraryMap m_Libraries;
+
+ bool m_BindFailed;
+
+protected:
+
+ ComponentLibrary(ComponentType type);
+
+public:
+
+ virtual ~ComponentLibrary();
+
+protected:
+
+ bool AddLibrary(const std::string &libName, const mpt::LibraryPath &libPath);
+ void ClearLibraries();
+ void SetBindFailed();
+ void ClearBindFailed();
+ bool HasBindFailed() const;
+
+public:
+
virtual mpt::Library GetLibrary(const std::string &libName) const;
- virtual void Initialize();
-
template <typename Tfunc>
bool Bind(Tfunc * & f, const std::string &libName, const std::string &symbol) const
{
@@ -134,6 +162,7 @@
};
+
#define MPT_COMPONENT_BIND(libName, func) do { if(!Bind( func , libName , #func )) { SetBindFailed(); } } while(0)
#define MPT_COMPONENT_BIND_OPTIONAL(libName, func) Bind( func , libName , #func )
#define MPT_COMPONENT_BIND_SYMBOL(libName, symbol, func) do { if(!Bind( func , libName , symbol )) { SetBindFailed(); } } while(0)
@@ -155,13 +184,13 @@
};
-class ComponentSystemDLL : public ComponentBase
+class ComponentSystemDLL : public ComponentLibrary
{
private:
mpt::PathString m_BaseName;
public:
ComponentSystemDLL(const mpt::PathString &baseName)
- : ComponentBase(ComponentTypeSystem)
+ : ComponentLibrary(ComponentTypeSystem)
, m_BaseName(baseName)
{
return;
@@ -174,13 +203,13 @@
};
-class ComponentBundledDLL : public ComponentBase
+class ComponentBundledDLL : public ComponentLibrary
{
private:
mpt::PathString m_FullName;
public:
ComponentBundledDLL(const mpt::PathString &fullName)
- : ComponentBase(ComponentTypeBundled)
+ : ComponentLibrary(ComponentTypeBundled)
, m_FullName(fullName)
{
return;
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2015-05-03 20:31:07 UTC (rev 5039)
@@ -255,7 +255,7 @@
typedef lame_global_flags *lame_t;
class ComponentLame
- : public ComponentBase
+ : public ComponentLibrary
{
MPT_DECLARE_COMPONENT_MEMBERS
@@ -329,7 +329,7 @@
public:
ComponentLame()
- : ComponentBase(ComponentTypeForeign)
+ : ComponentLibrary(ComponentTypeForeign)
{
return;
}
@@ -645,7 +645,7 @@
#ifdef MPT_MP3ENCODER_BLADE
class ComponentBlade
- : public ComponentBase
+ : public ComponentLibrary
{
MPT_DECLARE_COMPONENT_MEMBERS
@@ -673,7 +673,7 @@
public:
ComponentBlade()
- : ComponentBase(ComponentTypeForeign)
+ : ComponentLibrary(ComponentTypeForeign)
, isLame(false)
{
return;
Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp 2015-05-03 20:31:07 UTC (rev 5039)
@@ -35,7 +35,7 @@
class ComponentOpus
- : public ComponentBase
+ : public ComponentLibrary
{
MPT_DECLARE_COMPONENT_MEMBERS
@@ -65,7 +65,7 @@
public:
ComponentOpus()
- : ComponentBase(ComponentTypeForeign)
+ : ComponentLibrary(ComponentTypeForeign)
{
return;
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp 2015-05-03 20:31:07 UTC (rev 5039)
@@ -29,7 +29,7 @@
class ComponentVorbis
- : public ComponentBase
+ : public ComponentLibrary
{
MPT_DECLARE_COMPONENT_MEMBERS
@@ -69,7 +69,7 @@
public:
ComponentVorbis()
- : ComponentBase(ComponentTypeForeign)
+ : ComponentLibrary(ComponentTypeForeign)
{
return;
}
Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mo3.cpp 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp 2015-05-03 20:31:07 UTC (rev 5039)
@@ -34,7 +34,7 @@
#ifndef NO_MO3
-class ComponentUnMO3 : public ComponentBase
+class ComponentUnMO3 : public ComponentLibrary
{
MPT_DECLARE_COMPONENT_MEMBERS
public:
@@ -52,7 +52,7 @@
return (UNMO3_Decode_New ? UNMO3_Decode_New(data, len, flags) : UNMO3_Decode_Old(data, len));
}
public:
- ComponentUnMO3() : ComponentBase(ComponentTypeForeign) { }
+ ComponentUnMO3() : ComponentLibrary(ComponentTypeForeign) { }
std::string GetSettingsKey() const { return "UnMO3"; }
bool DoInitialize()
{
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-05-03 20:10:21 UTC (rev 5038)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2015-05-03 20:31:07 UTC (rev 5039)
@@ -2539,7 +2539,7 @@
#ifndef NO_MP3_SAMPLES
-class ComponentMPG123 : public ComponentBase
+class ComponentMPG123 : public ComponentLibrary
{
MPT_DECLARE_COMPONENT_MEMBERS
public:
@@ -2576,7 +2576,7 @@
MPG123_ENC_16 = 0x040, MPG123_ENC_SIGNED = 0x080,
};
public:
- ComponentMPG123() : ComponentBase(ComponentTypeForeign) { }
+ ComponentMPG123() : ComponentLibrary(ComponentTypeForeign) { }
std::string GetSettingsKey() const { return "Mpg123"; }
bool DoInitialize()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X