From: <man...@us...> - 2013-04-24 13:53:15
|
Revision: 1963 http://sourceforge.net/p/modplug/code/1963 Author: manxorist Date: 2013-04-24 13:53:05 +0000 (Wed, 24 Apr 2013) Log Message: ----------- [Ref] Move contact and credits string from mptrack/Mptrack.cpp to common/version.cpp and only give credit for code or help that is actually used in the current build. Modified Paths: -------------- trunk/OpenMPT/common/mptString.h trunk/OpenMPT/common/version.cpp trunk/OpenMPT/common/version.h trunk/OpenMPT/mptrack/Mptrack.cpp Modified: trunk/OpenMPT/common/mptString.h =================================================================== --- trunk/OpenMPT/common/mptString.h 2013-04-23 20:00:30 UTC (rev 1962) +++ trunk/OpenMPT/common/mptString.h 2013-04-24 13:53:05 UTC (rev 1963) @@ -68,3 +68,14 @@ }; } + +inline std::string string_replace(std::string str, const std::string &oldStr, const std::string &newStr) +{ + std::size_t pos = 0; + while((pos = str.find(oldStr, pos)) != std::string::npos) + { + str.replace(pos, oldStr.length(), newStr); + pos += newStr.length(); + } + return str; +} Modified: trunk/OpenMPT/common/version.cpp =================================================================== --- trunk/OpenMPT/common/version.cpp 2013-04-23 20:00:30 UTC (rev 1962) +++ trunk/OpenMPT/common/version.cpp 2013-04-24 13:53:05 UTC (rev 1963) @@ -136,4 +136,104 @@ return str.str(); } +std::string GetContactString() +{ + return "Contact / Discussion:\n" + "http://forum.openmpt.org/\n" + "\n" + "Updates:\n" + "http://openmpt.org/download"; +} + +std::string GetFullCreditsString() +{ + return +#ifdef MODPLUG_TRACKER + "OpenMPT / ModPlug Tracker\n" +#else + "libopenmpt (based on OpenMPT / ModPlug Tracker)\n" +#endif + "Copyright \xA9 2004-2013 Contributors\n" + "Copyright \xA9 1997-2003 Olivier Lapicque\n" + "\n" + "Contributors:\n" + "Johannes Schultz (2008-2013)\n" + "Ahti Lepp\xE4nen (2005-2011, 2013)\n" + "Joern Heusipp (2012-2013)\n" + "Robin Fernandes (2004-2007)\n" + "Sergiy Pylypenko (2007)\n" + "Eric Chavanon (2004-2005)\n" + "Trevor Nunes (2004)\n" + "Olivier Lapicque (1997-2003)\n" + "\n" + "Additional patch submitters:\n" + "coda (http://coda.s3m.us/)\n" + "kode54 (http://kode54.foobar2000.org/)\n" + "xaimus (http://xaimus.com/)\n" + "\n" + "Thanks to:\n" + "\n" + "Konstanty for the XMMS-ModPlug resampling implementation\n" + "http://modplug-xmms.sourceforge.net/\n" +#ifdef MODPLUG_TRACKER + "Stephan M. Bernsee for pitch shifting source code\n" + "http://www.dspdimension.com/\n" +#endif +#ifdef MODPLUG_TRACKER + "Olli Parviainen for SoundTouch Library (time stretching)\n" + "http://www.surina.net/soundtouch/\n" +#endif +#ifndef NO_VST + "Hermann Seib for his example VST Host implementation\n" + "http://www.hermannseib.com/english/vsthost.htm\n" +#endif +#ifndef NO_MO3 + "Ian Luck for UNMO3\n" + "http://www.un4seen.com/mo3.html\n" +#endif + "Ben \"GreaseMonkey\" Russell for IT sample compression code\n" + "https://github.com/iamgreaser/it2everything/\n" + "Jean-loup Gailly and Mark Adler for zlib\n" + "http://zlib.net/\n" +#ifndef NO_PORTAUDIO + "PortAudio contributors\n" + "http://www.portaudio.com/\n" +#endif +#ifndef NO_FLAC + "Josh Coalson for libFLAC\n" + "http://flac.sourceforge.net/\n" +#endif +#ifndef NO_MP3_SAMPLES + "The mpg123 project for libmpg123\n" + "http://mpg123.de/\n" +#endif + "Storlek for all the IT compatibility hints and testcases\n" + "as well as the IMF, OKT and ULT loaders\n" + "http://schismtracker.org/\n" +#ifdef MODPLUG_TRACKER + "Pel K. Txnder for the scrolling credits control :)\n" + "http://tinyurl.com/4yze8\n" +#endif + "\n" + "The people at ModPlug forums for crucial contribution\n" + "in the form of ideas, testing and support; thanks\n" + "particularly to:\n" + "33, Anboi, BooT-SectoR-ViruZ, Bvanoudtshoorn\n" + "christofori, Diamond, Ganja, Georg, Goor00, jmkz,\n" + "KrazyKatz, LPChip, Nofold, Rakib, Sam Zen\n" + "Skaven, Skilletaudio, Snu, Squirrel Havoc, Waxhead\n" + "\n" +#ifndef NO_VST + "\n" + "VST PlugIn Technology by Steinberg Media Technologies GmbH\n" +#endif +#ifndef NO_ASIO + "\n" + "ASIO Technology by Steinberg Media Technologies GmbH\n" +#endif + "\n" + ; + +} + } // namespace MptVersion Modified: trunk/OpenMPT/common/version.h =================================================================== --- trunk/OpenMPT/common/version.h 2013-04-23 20:00:30 UTC (rev 1962) +++ trunk/OpenMPT/common/version.h 2013-04-24 13:53:05 UTC (rev 1963) @@ -96,4 +96,7 @@ std::string GetVersionStringExtended(); std::string GetVersionUrlString(); + std::string GetFullCreditsString(); + std::string GetContactString(); + }; //namespace MptVersion Modified: trunk/OpenMPT/mptrack/Mptrack.cpp =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-04-23 20:00:30 UTC (rev 1962) +++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-04-24 13:53:05 UTC (rev 1963) @@ -1520,75 +1520,9 @@ m_bmp.LoadBitmap(MAKEINTRESOURCE(IDB_MPTRACK)); SetDlgItemText(IDC_EDIT2, CString("Build Date: ") + MptVersion::GetBuildDateString().c_str()); SetDlgItemText(IDC_EDIT3, CString("OpenMPT ") + MptVersion::GetVersionStringExtended().c_str()); - - m_heContact.SetWindowText( - "Contact / Discussion:\r\n" - "http://forum.openmpt.org/\r\n" - "\r\nUpdates:\r\n" - "http://openmpt.org/download"); - - static const char* const pArrCredit = - { - "OpenMPT / ModPlug Tracker|" - "Copyright \xA9 2004-2013 Contributors|" - "Copyright \xA9 1997-2003 Olivier Lapicque|" - "|" - "Contributors:|" - "Johannes Schultz (2008-2013)|" - "Ahti Lepp\xE4nen (2005-2011, 2013)|" - "Joern Heusipp (2012-2013)|" - "Robin Fernandes (2004-2007)|" - "Sergiy Pylypenko (2007)|" - "Eric Chavanon (2004-2005)|" - "Trevor Nunes (2004)|" - "Olivier Lapicque (1997-2003)|" - "|" - "Additional patch submitters:|" - "coda (http://coda.s3m.us/)|" - "kode54 (http://kode54.foobar2000.org/)|" - "xaimus (http://xaimus.com/)|" - "|" - "Thanks to:||" - "Konstanty for the XMMS-ModPlug resampling implementation |" - "http://modplug-xmms.sourceforge.net/|" - "Stephan M. Bernsee for pitch shifting source code|" - "http://www.dspdimension.com/|" - "Olli Parviainen for SoundTouch Library (time stretching)|" - "http://www.surina.net/soundtouch/|" - "Hermann Seib for his example VST Host implementation|" - "http://www.hermannseib.com/english/vsthost.htm|" - "Ian Luck for UNMO3|" - "http://www.un4seen.com/mo3.html|" - "Ben \"GreaseMonkey\" Russell for IT sample compression code|" - "https://github.com/iamgreaser/it2everything/|" - "Jean-loup Gailly and Mark Adler for zlib|" - "http://zlib.net/|" - "PortAudio|" - "http://www.portaudio.com/|" - "Josh Coalson for libFLAC|" - "http://flac.sourceforge.net/|" - "The mpg123 project for libmpg123|" - "http://mpg123.de/|" - "Storlek for all the IT compatibility hints and testcases|" - "as well as the IMF, OKT and ULT loaders|" - "http://schismtracker.org/|" - "Pel K. Txnder for the scrolling credits control :)|" - "http://tinyurl.com/4yze8|" - "|The people at ModPlug forums for crucial contribution|" - "in the form of ideas, testing and support; thanks|" - "particularly to:|" - "33, Anboi, BooT-SectoR-ViruZ, Bvanoudtshoorn|" - "christofori, Diamond, Ganja, Georg, Goor00, jmkz,|" - "KrazyKatz, LPChip, Nofold, Rakib, Sam Zen|" - "Skaven, Skilletaudio, Snu, Squirrel Havoc, Waxhead|" - "|||||||" - "VST PlugIn Technology by Steinberg Media Technologies GmbH|" - "ASIO Technology by Steinberg Media Technologies GmbH|" - "||||||" - }; - + m_heContact.SetWindowText( string_replace(MptVersion::GetContactString(), "\n", "\r\n" ).c_str()); m_static.SubclassDlgItem(IDC_CREDITS,this); - m_static.SetCredits(pArrCredit); + m_static.SetCredits((string_replace(MptVersion::GetFullCreditsString(), "\n", "|") + "||||||").c_str()); m_static.SetSpeed(DISPLAY_SLOW); m_static.SetColor(BACKGROUND_COLOR, RGB(138, 165, 219)); // Background Colour m_static.SetTransparent(); // Set parts of bitmaps with RGB(192,192,192) transparent This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |