Switched the method of how the Designer UI file is used in the DropBox class to ...

[lamexp/LameXP.git] / src / Thread_DiskObserver.cpp

diff --git a/src/Thread_DiskObserver.cpp b/src/Thread_DiskObserver.cpp
index 564521b..d72029f 100644 (file)
--- a/src/Thread_DiskObserver.cpp
+++ b/src/Thread_DiskObserver.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -22,10 +22,11 @@
 #include "Thread_DiskObserver.h"
 
 #include "Global.h"
+#include "Model_Progress.h"
 
 #include <QDir>
 
-#define MIN_DISKSPACE 104857600LL //100 MB
+#define MIN_DISKSPACE 104857600ui64 //100 MB
 
 ////////////////////////////////////////////////////////////
 // Constructor & Destructor
@@ -35,7 +36,6 @@ DiskObserverThread::DiskObserverThread(const QString &path)
 :
        m_path(makeRootDir(path))
 {
-       m_terminated = false;
 }
 
 DiskObserverThread::~DiskObserverThread(void)
@@ -62,22 +62,34 @@ void DiskObserverThread::run(void)
                FatalAppExit(0, L"Unhandeled exception error, application will exit!");
                TerminateProcess(GetCurrentProcess(), -1);
        }
+
+       while(m_semaphore.available()) m_semaphore.tryAcquire();
 }
 
 void DiskObserverThread::observe(void)
 {
-       __int64 freeSpace, minimumSpace = MIN_DISKSPACE;
+       unsigned __int64 minimumSpace = MIN_DISKSPACE;
+       unsigned __int64 freeSpace, previousSpace = 0ui64;
+       bool ok = false;
 
-       while(!m_terminated)
+       forever
        {
-               freeSpace = lamexp_free_diskspace(m_path);
-               if(freeSpace < minimumSpace)
+               freeSpace = lamexp_free_diskspace(m_path, &ok);
+               if(ok)
                {
-                       qWarning("Free diskspace on '%s' dropped below %s MB, only %s MB free!", m_path.toUtf8().constData(), QString::number(minimumSpace / 1048576ui64).toUtf8().constData(), QString::number(freeSpace / 1048576ui64).toUtf8().constData());
-                       emit messageLogged(tr("Low diskspace on drive '%1' detected (only %2 MB are free), problems can occur!").arg(QDir::toNativeSeparators(m_path), QString::number(freeSpace / 1048576ui64)), true);
-                       minimumSpace = min(freeSpace, (minimumSpace >> 1));
+                       if(freeSpace < minimumSpace)
+                       {
+                               qWarning("Free diskspace on '%s' dropped below %s MB, only %s MB free!", m_path.toUtf8().constData(), QString::number(minimumSpace / 1048576ui64).toUtf8().constData(), QString::number(freeSpace / 1048576ui64).toUtf8().constData());
+                               emit messageLogged(tr("Low diskspace on drive '%1' detected (only %2 MB are free), problems can occur!").arg(QDir::toNativeSeparators(m_path), QString::number(freeSpace / 1048576ui64)), ProgressModel::SysMsg_Warning);
+                               minimumSpace = qMin(freeSpace, (minimumSpace >> 1));
+                       }
+                       if(freeSpace != previousSpace)
+                       {
+                               emit freeSpaceChanged(freeSpace);
+                               previousSpace = freeSpace;
+                       }
                }
-               Sleep(1000);
+               if(m_semaphore.tryAcquire(1, 2000)) break;
        }
 }