/[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 2610 by schoenebeck, Sun Jun 8 19:09:26 2014 UTC revision 2683 by schoenebeck, Mon Dec 29 16:30:21 2014 UTC
# Line 118  protected: Line 118  protected:
118      NoteEntry eDimensionKeyRangeHigh;      NoteEntry eDimensionKeyRangeHigh;
119  };  };
120    
121  class LoadDialog : public Gtk::Dialog {  class ProgressDialog : public Gtk::Dialog {
122  public:  public:
123      LoadDialog(const Glib::ustring& title, Gtk::Window& parent);      ProgressDialog(const Glib::ustring& title, Gtk::Window& parent);
124      void set_fraction(float fraction) { progressBar.set_fraction(fraction); }      void set_fraction(float fraction) { progressBar.set_fraction(fraction); }
125  protected:  protected:
126      Gtk::ProgressBar progressBar;      Gtk::ProgressBar progressBar;
# Line 131  public: Line 131  public:
131      Loader(const char* filename);      Loader(const char* filename);
132      void launch();      void launch();
133      Glib::Dispatcher& signal_progress();      Glib::Dispatcher& signal_progress();
134      Glib::Dispatcher& signal_finished();      Glib::Dispatcher& signal_finished(); ///< Finished successfully, without error.
135        Glib::Dispatcher& signal_error();
136      void progress_callback(float fraction);      void progress_callback(float fraction);
137      float get_progress();      float get_progress();
138      const char* filename;      const Glib::ustring filename;
139        Glib::ustring error_message;
140      gig::File* gig;      gig::File* gig;
141    
142  private:  private:
# Line 142  private: Line 144  private:
144      void thread_function();      void thread_function();
145      Glib::Dispatcher finished_dispatcher;      Glib::Dispatcher finished_dispatcher;
146      Glib::Dispatcher progress_dispatcher;      Glib::Dispatcher progress_dispatcher;
147        Glib::Dispatcher error_dispatcher;
148        Glib::Threads::Mutex progressMutex;
149        float progress;
150    };
151    
152    class Saver : public sigc::trackable {
153    public:
154        Saver(gig::File* file, Glib::ustring filename = ""); ///< one argument means "save", two arguments means "save as"
155        void launch();
156        Glib::Dispatcher& signal_progress();
157        Glib::Dispatcher& signal_finished(); ///< Finished successfully, without error.
158        Glib::Dispatcher& signal_error();
159        void progress_callback(float fraction);
160        float get_progress();
161        gig::File* gig;
162        const Glib::ustring filename;
163        Glib::ustring error_message;
164    
165    private:
166        Glib::Threads::Thread* thread;
167        void thread_function();
168        Glib::Dispatcher finished_dispatcher;
169        Glib::Dispatcher progress_dispatcher;
170        Glib::Dispatcher error_dispatcher;
171      Glib::Threads::Mutex progressMutex;      Glib::Threads::Mutex progressMutex;
172      float progress;      float progress;
173  };  };
# Line 205  protected: Line 231  protected:
231      void dimreg_changed();      void dimreg_changed();
232      void on_loader_progress();      void on_loader_progress();
233      void on_loader_finished();      void on_loader_finished();
234        void on_loader_error();
235        void on_saver_progress();
236        void on_saver_error();
237        void on_saver_finished();
238    
239      void dimreg_all_dimregs_toggled();      void dimreg_all_dimregs_toggled();
240      gig::Instrument* get_instrument();      gig::Instrument* get_instrument();
241      void add_region_to_dimregs(gig::Region* region, bool stereo, bool all_dimregs);      void add_region_to_dimregs(gig::Region* region, bool stereo, bool all_dimregs);
# Line 231  protected: Line 262  protected:
262    
263      Gtk::Menu* instrument_menu;      Gtk::Menu* instrument_menu;
264    
265        std::map<gig::Sample*,int> sample_ref_count;
266    
267      class SamplesModel : public Gtk::TreeModel::ColumnRecord {      class SamplesModel : public Gtk::TreeModel::ColumnRecord {
268      public:      public:
269          SamplesModel() {          SamplesModel() {
270              add(m_col_name);              add(m_col_name);
271              add(m_col_sample);              add(m_col_sample);
272              add(m_col_group);              add(m_col_group);
273                add(m_col_refcount);
274                add(m_color);
275          }          }
276    
277          Gtk::TreeModelColumn<Glib::ustring> m_col_name;          Gtk::TreeModelColumn<Glib::ustring> m_col_name;
278          Gtk::TreeModelColumn<gig::Sample*> m_col_sample;          Gtk::TreeModelColumn<gig::Sample*> m_col_sample;
279          Gtk::TreeModelColumn<gig::Group*> m_col_group;          Gtk::TreeModelColumn<gig::Group*> m_col_group;
280            Gtk::TreeModelColumn<Glib::ustring> m_col_refcount;
281            Gtk::TreeModelColumn<Glib::ustring> m_color;
282      } m_SamplesModel;      } m_SamplesModel;
283    
284      class SamplesTreeStore : public Gtk::TreeStore {      class SamplesTreeStore : public Gtk::TreeStore {
# Line 336  protected: Line 373  protected:
373      void on_action_duplicate_instrument();      void on_action_duplicate_instrument();
374      void on_action_remove_instrument();      void on_action_remove_instrument();
375    
376        void show_samples_tab();
377        void show_intruments_tab();
378        void show_scripts_tab();
379    
380      void add_instrument(gig::Instrument* instrument);      void add_instrument(gig::Instrument* instrument);
381      Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,      Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,
382                                                 int position = -1);                                                 int position = -1);
383      void remove_instrument_from_menu(int index);      void remove_instrument_from_menu(int index);
384    
385      LoadDialog* load_dialog;      ProgressDialog* progress_dialog;
386      Loader* loader;      Loader* loader;
387        Saver* saver;
388      void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);      void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);
389        void updateSampleRefCountMap(gig::File* gig);
390    
391      gig::File* file;      gig::File* file;
392      bool file_is_shared;      bool file_is_shared;
# Line 373  protected: Line 416  protected:
416    
417      void script_name_changed(const Gtk::TreeModel::Path& path,      void script_name_changed(const Gtk::TreeModel::Path& path,
418                               const Gtk::TreeModel::iterator& iter);                               const Gtk::TreeModel::iterator& iter);
419        void script_double_clicked(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
420      void sample_name_changed(const Gtk::TreeModel::Path& path,      void sample_name_changed(const Gtk::TreeModel::Path& path,
421                               const Gtk::TreeModel::iterator& iter);                               const Gtk::TreeModel::iterator& iter);
422      void instrument_name_changed(const Gtk::TreeModel::Path& path,      void instrument_name_changed(const Gtk::TreeModel::Path& path,
# Line 381  protected: Line 425  protected:
425      sigc::connection instrument_name_connection;      sigc::connection instrument_name_connection;
426    
427      void on_action_combine_instruments();      void on_action_combine_instruments();
428        void on_action_view_references();
429      void on_action_merge_files();      void on_action_merge_files();
430      void mergeFiles(const std::vector<std::string>& filenames);      void mergeFiles(const std::vector<std::string>& filenames);
431    
432        void on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample);
433        void on_sample_ref_count_incremented(gig::Sample* sample, int offset);
434        void on_samples_to_be_removed(std::list<gig::Sample*> samples);
435    
436      void __import_queued_samples();      void __import_queued_samples();
437      void __clear();      void __clear();
438      void __refreshEntireGUI();      void __refreshEntireGUI();

Legend:
Removed from v.2610  
changed lines
  Added in v.2683

  ViewVC Help
Powered by ViewVC