liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal new background directory scanning for Windows; see issue #597

Browse Source
This commit is contained in:
Oliver Duis
2011-03-25 22:17:16 +01:00
parent 0f416b379a
commit adc5518d52
8 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rtthumbnail.cc
View File

@@ -518,7 +518,7 @@ Thumbnail::Thumbnail () :
Thumbnail::~Thumbnail () {
delete thumbImg;
delete thumbImg; thumbImg=NULL;
delete [] aeHistogram;
delete [] embProfileData;
if (embProfile)

6
rtgui/dirbrowser.cc
View File

@@ -140,6 +140,8 @@ void DirBrowser::updateVolumes () {
int nvolumes = GetLogicalDrives ();
if (nvolumes!=volumes) {
gdk_threads_enter();
for (int i=0; i<32; i++)
if (((volumes >> i) & 1) && !((nvolumes >> i) & 1)) { // volume i has been deleted
for (Gtk::TreeModel::iterator iter = dirTreeModel->children().begin(); iter!=dirTreeModel->children().end(); iter++)
@@ -151,14 +153,14 @@ void DirBrowser::updateVolumes () {
else if (!((volumes >> i) & 1) && ((nvolumes >> i) & 1))
addRoot ('A'+i); // volume i has been added
volumes = nvolumes;
gdk_threads_leave();
}
}
int _updateVolumes (void* br) {
gdk_threads_enter ();
((DirBrowser*)br)->updateVolumes ();
gdk_threads_leave ();
return 1;
}
int _updateDirTree (void* br) {

4
rtgui/filebrowser.cc
View File

@@ -190,7 +190,7 @@ struct addparams {
FileBrowserEntry* entry;
};
int addfl (void* data) {
int AddEntryUIThread (void* data) {
addparams* ap = (addparams*) data;
FileBrowserIdleHelper* fbih = ap->fbih;
@@ -222,7 +222,7 @@ void FileBrowser::addEntry (FileBrowserEntry* entry) {
addparams* ap = new addparams;
ap->fbih = fbih;
ap->entry = entry;
g_idle_add (addfl, ap);
g_idle_add (AddEntryUIThread, ap);
}
void FileBrowser::addEntry_ (FileBrowserEntry* entry) {

26
rtgui/filecatalog.cc
View File

@@ -36,19 +36,6 @@
extern Glib::ustring argv0;
#ifdef _WIN32
int _directoryUpdater (void* cat) {
((FileCatalog*)cat)->checkCounter++;
if (((FileCatalog*)cat)->checkCounter==2) {
gdk_threads_enter ();
((FileCatalog*)cat)->reparseDirectory ();
gdk_threads_leave ();
}
return 1;
}
#endif
FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
selectedDirectoryId(1),
listener(NULL),
@@ -235,8 +222,6 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
selectedDirectory = "";
#ifdef _WIN32
wdMonitor = NULL;
checkCounter = 2;
g_timeout_add (CHECKTIME, _directoryUpdater, this);
#endif
}
@@ -958,9 +943,16 @@ int FileCatalog::reparseDirectory () {
}
#ifdef _WIN32
void FileCatalog::winDirChanged () {
int winDirChangedUITread (void* cat) {
gdk_threads_enter ();
((FileCatalog*)cat)->reparseDirectory ();
gdk_threads_leave ();
checkCounter = 0;
return 0;
}
void FileCatalog::winDirChanged () {
g_idle_add(winDirChangedUITread, this);
}
#endif

1
rtgui/filecatalog.h
View File

@@ -115,7 +115,6 @@ class FileCatalog : public Gtk::VBox,
#ifdef _WIN32
WinDirMonitor* wdMonitor;
public:
int checkCounter;
void winDirChanged ();
private:
#endif

5
rtgui/thumbnail.cc
View File

@@ -140,6 +140,7 @@ bool Thumbnail::isSupported () {
}
const ProcParams& Thumbnail::getProcParams () {
Glib::Mutex::Lock lock(mutex);
if (pparamsValid)
return pparams;
@@ -160,6 +161,7 @@ const ProcParams& Thumbnail::getProcParams () {
}
void Thumbnail::loadProcParams () {
Glib::Mutex::Lock lock(mutex);
pparamsValid = false;
if (options.paramsLoadLocation==PLL_Input) {
@@ -181,6 +183,7 @@ void Thumbnail::loadProcParams () {
}
void Thumbnail::clearProcParams (int whoClearedIt) {
Glib::Mutex::Lock lock(mutex);
cfs.recentlySaved = false;
pparamsValid = false;
@@ -208,6 +211,7 @@ bool Thumbnail::hasProcParams () {
}
void Thumbnail::setProcParams (const ProcParams& pp, int whoChangedIt, bool updateCacheNow) {
Glib::Mutex::Lock lock(mutex);
if (pparams!=pp)
cfs.recentlySaved = false;
@@ -514,6 +518,7 @@ void Thumbnail::updateCache () {
}
Thumbnail::~Thumbnail () {
Glib::Mutex::Lock lock(mutex);
delete [] lastImg;
delete tpp;

20
rtgui/windirmonitor.cc
View File

@@ -19,17 +19,19 @@
#include <windirmonitor.h>
static void CALLBACK current_directory_monitor_callback (DWORD error, DWORD nBytes, LPOVERLAPPED lpOverlapped) {
// printf ("hivas: %d %d %d\n", error, nBytes, lpOverlapped);
WinDirMonitor::MonitorData* monData = (WinDirMonitor::MonitorData*)lpOverlapped;
if (!nBytes) {
delete monData;
return;
}
if (monData->listener)
// ReadDirectoryChangesW sometimes emits multiple events per change (one for each change type)
// To make sure it's not flooding update, this gets filtered.
time_t curTime= ::time(NULL);
if (monData->listener && ::difftime(curTime, monData->lastTimeUpdateDir)>1.0) {
monData->listener->winDirChanged ();
monData->lastTimeUpdateDir = curTime;
}
ReadDirectoryChangesW (monData->hDirectory,
monData->file_notify_buffer,
@@ -37,16 +39,14 @@ static void CALLBACK current_directory_monitor_callback (DWORD error, DWORD nByt
FALSE,
FILE_NOTIFY_CHANGE_FILE_NAME |
FILE_NOTIFY_CHANGE_DIR_NAME |
FILE_NOTIFY_CHANGE_ATTRIBUTES |
FILE_NOTIFY_CHANGE_SIZE,
FILE_NOTIFY_CHANGE_LAST_WRITE,
&monData->buffer_filled_bytes,
&monData->overlapped,
current_directory_monitor_callback);
}
WinDirMonitor::WinDirMonitor (Glib::ustring dirName, WinDirChangeListener* listener) : monData(NULL) {
wchar_t* wdirname = (wchar_t*)g_utf8_to_utf16 (dirName.raw().c_str(), -1, NULL, NULL, NULL);
wchar_t* wdirname = (wchar_t*)g_utf8_to_utf16 (dirName.c_str(), -1, NULL, NULL, NULL);
HANDLE hDirectory = CreateFileW (wdirname, FILE_LIST_DIRECTORY,FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL);
g_free (wdirname);
@@ -57,6 +57,7 @@ WinDirMonitor::WinDirMonitor (Glib::ustring dirName, WinDirChangeListener* liste
monData->buffer_allocated_bytes = 32768;
monData->file_notify_buffer = new char [monData->buffer_allocated_bytes];
monData->hDirectory = hDirectory;
monData->lastTimeUpdateDir = ::time(NULL);
// printf ("mondata=%d\n", monData);
ReadDirectoryChangesW (monData->hDirectory,
@@ -65,8 +66,7 @@ WinDirMonitor::WinDirMonitor (Glib::ustring dirName, WinDirChangeListener* liste
FALSE,
FILE_NOTIFY_CHANGE_FILE_NAME |
FILE_NOTIFY_CHANGE_DIR_NAME |
FILE_NOTIFY_CHANGE_ATTRIBUTES |
FILE_NOTIFY_CHANGE_SIZE,
FILE_NOTIFY_CHANGE_LAST_WRITE,
&monData->buffer_filled_bytes,
&monData->overlapped,
current_directory_monitor_callback);

1
rtgui/windirmonitor.h
View File

@@ -39,6 +39,7 @@ class WinDirMonitor : public Glib::Object {
HANDLE hDirectory;
WinDirChangeListener* listener;
int bigyo;
time_t lastTimeUpdateDir; // for filtering multiple updates events
};
private: