/[svn]/gigedit/trunk/src/gigedit/gigedit.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/gigedit.cpp

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

revision 1823 by persson, Sun Dec 28 09:58:05 2008 UTC revision 2332 by persson, Wed Mar 14 05:22:26 2012 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2007, 2008 Andreas Persson   * Copyright (C) 2007-2009 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 19  Line 19 
19    
20  #include "gigedit.h"  #include "gigedit.h"
21    
22  #include <gtkmm/main.h>  #include <glibmm/dispatcher.h>
23  #include <glibmm/main.h>  #include <glibmm/main.h>
24    #include <gtkmm/main.h>
25    
26  #include "mainwindow.h"  #include "mainwindow.h"
27    
28  #include "global.h"  #include "global.h"
# Line 48  private: Line 50  private:
50      class Cond {      class Cond {
51      private:      private:
52          bool pred;          bool pred;
53          Glib::Mutex mutex;          Glib::Threads::Mutex mutex;
54          Glib::Cond cond;          Glib::Threads::Cond cond;
55      public:      public:
56          Cond() : pred(false) { }          Cond() : pred(false) { }
57          void signal() {          void signal() {
58              Glib::Mutex::Lock lock(mutex);              Glib::Threads::Mutex::Lock lock(mutex);
59              pred = true;              pred = true;
60              cond.signal();              cond.signal();
61          }          }
62          void wait() {          void wait() {
63              Glib::Mutex::Lock lock(mutex);              Glib::Threads::Mutex::Lock lock(mutex);
64              while (!pred) cond.wait(mutex);              while (!pred) cond.wait(mutex);
65          }          }
66      };      };
67    
68    #ifdef OLD_THREADS
69      static Glib::StaticMutex mutex;      static Glib::StaticMutex mutex;
70    #else
71        static Glib::Threads::Mutex mutex;
72    #endif
73      static Glib::Dispatcher* dispatcher;      static Glib::Dispatcher* dispatcher;
74      static GigEditState* current;      static GigEditState* current;
75    
# Line 79  private: Line 85  private:
85      void close_window();      void close_window();
86  };  };
87    
88    #ifdef WIN32
89    HINSTANCE gigedit_dll_handle = 0;
90    #endif
91    
92  void init_app() {  void init_app() {
93      static bool process_initialized = false;      static bool process_initialized = false;
94      if (!process_initialized) {      if (!process_initialized) {
# Line 91  void init_app() { Line 101  void init_app() {
101  #ifdef WIN32  #ifdef WIN32
102  #if GLIB_CHECK_VERSION(2, 16, 0)  #if GLIB_CHECK_VERSION(2, 16, 0)
103          gchar* root =          gchar* root =
104              g_win32_get_package_installation_directory_of_module(NULL);              g_win32_get_package_installation_directory_of_module(gigedit_dll_handle);
105  #else  #else
106          gchar* root =          gchar* root =
107              g_win32_get_package_installation_directory(NULL, NULL);              g_win32_get_package_installation_directory(NULL, NULL);
# Line 109  void init_app() { Line 119  void init_app() {
119          textdomain(GETTEXT_PACKAGE);          textdomain(GETTEXT_PACKAGE);
120  #endif // HAVE_GETTEXT  #endif // HAVE_GETTEXT
121    
122    #ifdef OLD_THREADS
123          // make sure thread_init() is called once and ONLY once per process          // make sure thread_init() is called once and ONLY once per process
124          if (!Glib::thread_supported()) Glib::thread_init();          if (!Glib::thread_supported()) Glib::thread_init();
125    #endif
126          process_initialized = true;          process_initialized = true;
127      }      }
128  }  }
# Line 144  void connect_signals(GigEdit* gigedit, M Line 155  void connect_signals(GigEdit* gigedit, M
155      mainwindow->signal_dimreg_changed().connect(      mainwindow->signal_dimreg_changed().connect(
156          gigedit->signal_dimreg_changed().make_slot()          gigedit->signal_dimreg_changed().make_slot()
157      );      );
158        mainwindow->signal_sample_changed().connect(
159            gigedit->signal_sample_changed().make_slot()
160        );
161      mainwindow->signal_sample_ref_changed().connect(      mainwindow->signal_sample_ref_changed().connect(
162          gigedit->signal_sample_ref_changed().make_slot()          gigedit->signal_sample_ref_changed().make_slot()
163      );      );
# Line 226  sigc::signal<void, gig::DimensionRegion* Line 240  sigc::signal<void, gig::DimensionRegion*
240      return dimreg_changed_signal;      return dimreg_changed_signal;
241  }  }
242    
243    sigc::signal<void, gig::Sample*>& GigEdit::signal_sample_changed() {
244        return sample_changed_signal;
245    }
246    
247  sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& GigEdit::signal_sample_ref_changed() {  sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& GigEdit::signal_sample_ref_changed() {
248      return sample_ref_changed_signal;      return sample_ref_changed_signal;
249  }  }
# Line 238  sigc::signal<void, int/*key*/, int/*velo Line 256  sigc::signal<void, int/*key*/, int/*velo
256      return keyboard_key_released_signal;      return keyboard_key_released_signal;
257  }  }
258    
259    #ifdef OLD_THREADS
260  Glib::StaticMutex GigEditState::mutex = GLIBMM_STATIC_MUTEX_INIT;  Glib::StaticMutex GigEditState::mutex = GLIBMM_STATIC_MUTEX_INIT;
261    #else
262    Glib::Threads::Mutex GigEditState::mutex;
263    #endif
264  Glib::Dispatcher* GigEditState::dispatcher = 0;  Glib::Dispatcher* GigEditState::dispatcher = 0;
265  GigEditState* GigEditState::current = 0;  GigEditState* GigEditState::current = 0;
266    
# Line 283  void GigEditState::run(gig::Instrument* Line 305  void GigEditState::run(gig::Instrument*
305      static bool main_loop_started = false;      static bool main_loop_started = false;
306      if (!main_loop_started) {      if (!main_loop_started) {
307          Cond initialized;          Cond initialized;
308    #ifdef OLD_THREADS
309          Glib::Thread::create(          Glib::Thread::create(
310              sigc::bind(sigc::ptr_fun(&GigEditState::main_loop_run),              sigc::bind(sigc::ptr_fun(&GigEditState::main_loop_run),
311                         &initialized),                         &initialized),
312              false);              false);
313    #else
314            Glib::Threads::Thread::create(
315                sigc::bind(sigc::ptr_fun(&GigEditState::main_loop_run),
316                           &initialized));
317    #endif
318          initialized.wait();          initialized.wait();
319          main_loop_started = true;          main_loop_started = true;
320      }      }
# Line 297  void GigEditState::run(gig::Instrument* Line 325  void GigEditState::run(gig::Instrument*
325      mutex.unlock();      mutex.unlock();
326      close.wait(); // sleep until window is closed      close.wait(); // sleep until window is closed
327  }  }
328    
329    #if defined(WIN32)
330    extern "C" {
331        BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
332        {
333            switch (reason) {
334            case DLL_PROCESS_ATTACH:
335                gigedit_dll_handle = instance;
336                break;
337            }
338            return TRUE;
339        }
340    }
341    #endif
Legend:
Removed from v.1823  
changed lines
  Added in v.2332
  ViewVC Help
Powered by ViewVC