Add simple utilitiy to auto-inc build numbers + fix duration for very short files

diff --git a/LameXP.vcproj b/LameXP.vcproj
index 2169984..b7fe0aa 100644 (file)
--- a/LameXP.vcproj
+++ b/LameXP.vcproj
@@ -106,6 +106,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="&quot;$(ProjectDir)\etc\Utilities\AutoInc.exe&quot; &quot;VER_LAMEXP_BUILD&quot; &quot;$(ProjectDir)\src\Config.h&quot;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -196,6 +197,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="&quot;$(ProjectDir)\etc\Utilities\AutoInc.exe&quot; &quot;VER_LAMEXP_BUILD&quot; &quot;$(ProjectDir)\src\Config.h&quot;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -275,7 +277,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine=""
+                               CommandLine="&#x0D;&#x0A;"
                        />
                </Configuration>
        </Configurations>

diff --git a/etc/Utilities/AutoInc.exe b/etc/Utilities/AutoInc.exe
new file mode 100644 (file)
index 0000000..563290a
Binary files /dev/null and b/etc/Utilities/AutoInc.exe differ

diff --git a/src/Config.h b/src/Config.h
index ddb10c5..5dce741 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,7 +25,7 @@
 #define VER_LAMEXP_MAJOR                               4
 #define VER_LAMEXP_MINOR_HI                            0
 #define VER_LAMEXP_MINOR_LO                            0
-#define VER_LAMEXP_BUILD                               12
+#define VER_LAMEXP_BUILD                               17
 #define VER_LAMEXP_SUFFIX                              TechPreview
 
 /*

diff --git a/src/Thread_FileAnalyzer.cpp b/src/Thread_FileAnalyzer.cpp
index dc19271..ac3a685 100644 (file)
--- a/src/Thread_FileAnalyzer.cpp
+++ b/src/Thread_FileAnalyzer.cpp
@@ -321,22 +321,28 @@ unsigned int FileAnalyzer::parseDuration(const QString &str)
 {
        QTime time;
 
+       time = QTime::fromString(str, "z'ms'");
+       if(time.isValid())
+       {
+               return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
+       }
+
        time = QTime::fromString(str, "s's 'z'ms'");
        if(time.isValid())
        {
-               return (time.hour() * 60 * 60) + (time.minute() * 60) + time.second();
+               return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
        }
 
        time = QTime::fromString(str, "m'mn 's's'");
        if(time.isValid())
        {
-               return (time.hour() * 60 * 60) + (time.minute() * 60) + time.second();
+               return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
        }
 
        time = QTime::fromString(str, "h'h 'm'mn'");
        if(time.isValid())
        {
-               return (time.hour() * 60 * 60) + (time.minute() * 60) + time.second();
+               return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
        }
 
        return 0;