From: MythTV P. d. m. <myt...@li...> - 2015-02-09 20:38:04
|
Revision: 309 http://sourceforge.net/p/mythtvplayer/code/309 Author: arobro Date: 2015-02-09 20:38:02 +0000 (Mon, 09 Feb 2015) Log Message: ----------- Fixed the truncation of file sizes above 4gig in MythTv 0.25+ when the protocol changed from two 32bit integers to one 64bit integer. Modified Paths: -------------- trunk/src/MythPlayerDefines.h trunk/src/MythTv/MythCommand.cpp trunk/src/MythTv/MythCommand.h Modified: trunk/src/MythPlayerDefines.h =================================================================== --- trunk/src/MythPlayerDefines.h 2015-02-06 19:57:51 UTC (rev 308) +++ trunk/src/MythPlayerDefines.h 2015-02-09 20:38:02 UTC (rev 309) @@ -26,7 +26,7 @@ //#define ENABLE_OFFLINE #define PRERELEASE "0" -#define REVISION "300" +#define REVISION "309" #define VERSION_MAJOR "0" #define VERSION_MINOR "7" #define VERSION_SUBMINOR "2" Modified: trunk/src/MythTv/MythCommand.cpp =================================================================== --- trunk/src/MythTv/MythCommand.cpp 2015-02-06 19:57:51 UTC (rev 308) +++ trunk/src/MythTv/MythCommand.cpp 2015-02-09 20:38:02 UTC (rev 309) @@ -151,9 +151,9 @@ } //Int64 spans one line //(mythtv 0.25 uses one 64bit integer, instead of joining two 32 bit integers together) -int64 MythCommand::getInt64OneLineSpan(uint64 index) const +int64 MythCommand::getInt64OneLineSpan(uint32 index) const { - return Tools::String::toInt64(get(index)); + return strtoll (get(index).c_str(), NULL, 10); } void MythCommand::addInt32(int32 val) { Modified: trunk/src/MythTv/MythCommand.h =================================================================== --- trunk/src/MythTv/MythCommand.h 2015-02-06 19:57:51 UTC (rev 308) +++ trunk/src/MythTv/MythCommand.h 2015-02-09 20:38:02 UTC (rev 309) @@ -50,7 +50,7 @@ float getFloat(uint32 index) const; //int64 spans two lines! int64 getInt64(uint32 index) const; - int64 getInt64OneLineSpan(uint64 index) const; + int64 getInt64OneLineSpan(uint32 index) const; bool getBool(uint32 index) const; void addInt32(int32 val); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |