/[svn]/gigedit/trunk/src/gigedit/mainwindow.h
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3471 by persson, Sat Feb 16 19:13:37 2019 UTC revision 3472 by persson, Sat Feb 16 19:56:56 2019 UTC
# Line 59  Line 59 
59  #include "dimregionchooser.h"  #include "dimregionchooser.h"
60  #include "dimregionedit.h"  #include "dimregionedit.h"
61  #include "midirules.h"  #include "midirules.h"
62    #ifdef GLIB_THREADS
63  #ifndef OLD_THREADS  #ifndef OLD_THREADS
64  #include <glibmm/threads.h>  #include <glibmm/threads.h>
65  #endif  #endif
66    #else
67    #include <thread>
68    #include <mutex>
69    #endif
70  #include "ManagedWindow.h"  #include "ManagedWindow.h"
71    
72  class MainWindow;  class MainWindow;
# Line 173  protected: Line 178  protected:
178      LoaderSaverBase(const Glib::ustring filename, gig::File* gig);      LoaderSaverBase(const Glib::ustring filename, gig::File* gig);
179    
180  private:  private:
181    #ifdef GLIB_THREADS
182      Glib::Threads::Thread* thread;      Glib::Threads::Thread* thread;
183        Glib::Threads::Mutex progressMutex;
184    #else
185        std::thread thread;
186        std::mutex progressMutex;
187    #endif
188      void thread_function();      void thread_function();
189      virtual void thread_function_sub(gig::progress_t& progress) = 0;      virtual void thread_function_sub(gig::progress_t& progress) = 0;
190      Glib::Dispatcher finished_dispatcher;      Glib::Dispatcher finished_dispatcher;
191      Glib::Dispatcher progress_dispatcher;      Glib::Dispatcher progress_dispatcher;
192      Glib::Dispatcher error_dispatcher;      Glib::Dispatcher error_dispatcher;
     Glib::Threads::Mutex progressMutex;  
193      float progress;      float progress;
194  };  };
195    
Legend:
Removed from v.3471  
changed lines
  Added in v.3472
  ViewVC Help
Powered by ViewVC