/[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 2644 by schoenebeck, Tue Jun 17 22:55:02 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 336  protected: Line 342  protected:
342      void on_action_duplicate_instrument();      void on_action_duplicate_instrument();
343      void on_action_remove_instrument();      void on_action_remove_instrument();
344    
345        void show_samples_tab();
346        void show_intruments_tab();
347        void show_scripts_tab();
348    
349      void add_instrument(gig::Instrument* instrument);      void add_instrument(gig::Instrument* instrument);
350      Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,      Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name,
351                                                 int position = -1);                                                 int position = -1);
# Line 344  protected: Line 354  protected:
354      LoadDialog* load_dialog;      LoadDialog* load_dialog;
355      Loader* loader;      Loader* loader;
356      void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);      void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false);
357        void updateSampleRefCountMap(gig::File* gig);
358    
359      gig::File* file;      gig::File* file;
360      bool file_is_shared;      bool file_is_shared;
# Line 373  protected: Line 384  protected:
384    
385      void script_name_changed(const Gtk::TreeModel::Path& path,      void script_name_changed(const Gtk::TreeModel::Path& path,
386                               const Gtk::TreeModel::iterator& iter);                               const Gtk::TreeModel::iterator& iter);
387        void script_double_clicked(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
388      void sample_name_changed(const Gtk::TreeModel::Path& path,      void sample_name_changed(const Gtk::TreeModel::Path& path,
389                               const Gtk::TreeModel::iterator& iter);                               const Gtk::TreeModel::iterator& iter);
390      void instrument_name_changed(const Gtk::TreeModel::Path& path,      void instrument_name_changed(const Gtk::TreeModel::Path& path,
# Line 381  protected: Line 393  protected:
393      sigc::connection instrument_name_connection;      sigc::connection instrument_name_connection;
394    
395      void on_action_combine_instruments();      void on_action_combine_instruments();
396        void on_action_view_references();
397      void on_action_merge_files();      void on_action_merge_files();
398      void mergeFiles(const std::vector<std::string>& filenames);      void mergeFiles(const std::vector<std::string>& filenames);
399    
400        void on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample);
401        void on_sample_ref_count_incremented(gig::Sample* sample, int offset);
402        void on_samples_to_be_removed(std::list<gig::Sample*> samples);
403    
404      void __import_queued_samples();      void __import_queued_samples();
405      void __clear();      void __clear();
406      void __refreshEntireGUI();      void __refreshEntireGUI();

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

  ViewVC Help
Powered by ViewVC