/[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 2620 by schoenebeck, Sun Jun 8 19:09:26 2014 UTC revision 2621 by schoenebeck, Wed Jun 11 16:46:27 2014 UTC
# Line 231  protected: Line 231  protected:
231    
232      Gtk::Menu* instrument_menu;      Gtk::Menu* instrument_menu;
233    
234        std::map<gig::Sample*,int> sample_ref_count;
235    
236      class SamplesModel : public Gtk::TreeModel::ColumnRecord {      class SamplesModel : public Gtk::TreeModel::ColumnRecord {
237      public:      public:
238          SamplesModel() {          SamplesModel() {
239              add(m_col_name);              add(m_col_name);
240              add(m_col_sample);              add(m_col_sample);
241              add(m_col_group);              add(m_col_group);
242                add(m_col_refcount);
243                add(m_color);
244          }          }
245    
246          Gtk::TreeModelColumn<Glib::ustring> m_col_name;          Gtk::TreeModelColumn<Glib::ustring> m_col_name;
247          Gtk::TreeModelColumn<gig::Sample*> m_col_sample;          Gtk::TreeModelColumn<gig::Sample*> m_col_sample;
248          Gtk::TreeModelColumn<gig::Group*> m_col_group;          Gtk::TreeModelColumn<gig::Group*> m_col_group;
249            Gtk::TreeModelColumn<Glib::ustring> m_col_refcount;
250            Gtk::TreeModelColumn<Glib::ustring> m_color;
251      } m_SamplesModel;      } m_SamplesModel;
252    
253      class SamplesTreeStore : public Gtk::TreeStore {      class SamplesTreeStore : public Gtk::TreeStore {
# Line 344  protected: Line 350  protected:
350      LoadDialog* load_dialog;      LoadDialog* load_dialog;
351      Loader* loader;      Loader* loader;
352      void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);      void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);
353        void updateSampleRefCountMap(gig::File* gig);
354    
355      gig::File* file;      gig::File* file;
356      bool file_is_shared;      bool file_is_shared;
# Line 384  protected: Line 391  protected:
391      void on_action_merge_files();      void on_action_merge_files();
392      void mergeFiles(const std::vector<std::string>& filenames);      void mergeFiles(const std::vector<std::string>& filenames);
393    
394        void on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample);
395        void on_sample_ref_count_incremented(gig::Sample* sample, int offset);
396        void on_samples_to_be_removed(std::list<gig::Sample*> samples);
397    
398      void __import_queued_samples();      void __import_queued_samples();
399      void __clear();      void __clear();
400      void __refreshEntireGUI();      void __refreshEntireGUI();

Legend:
Removed from v.2620  
changed lines
  Added in v.2621

  ViewVC Help
Powered by ViewVC