Converted model::Project to use observable_list
This commit is contained in:
parent
bbc55e6324
commit
48dd2055f5
3 changed files with 6 additions and 17 deletions
|
|
@ -43,7 +43,7 @@ Project::~Project()
|
|||
|
||||
}
|
||||
|
||||
const std::list< shared_ptr<Sequence> >&
|
||||
lumiera::observable_list< boost::shared_ptr<Sequence> >&
|
||||
Project::get_sequences()
|
||||
{
|
||||
return sequences;
|
||||
|
|
@ -55,14 +55,6 @@ Project::add_new_sequence(Glib::ustring name)
|
|||
shared_ptr<Sequence> sequence(new Sequence());
|
||||
sequence->set_name(name);
|
||||
sequences.push_back(sequence);
|
||||
sequenceListChangedSignal.emit();
|
||||
|
||||
}
|
||||
|
||||
sigc::signal<void>&
|
||||
Project::signal_sequence_list_changed()
|
||||
{
|
||||
return sequenceListChangedSignal;
|
||||
}
|
||||
|
||||
} // namespace model
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#define PROJECT_HPP
|
||||
|
||||
#include "sequence.hpp"
|
||||
#include "../../common/observable-list.hpp"
|
||||
|
||||
namespace gui {
|
||||
namespace model {
|
||||
|
|
@ -39,18 +40,14 @@ public:
|
|||
|
||||
~Project();
|
||||
|
||||
const std::list< boost::shared_ptr<Sequence> >& get_sequences();
|
||||
lumiera::observable_list< boost::shared_ptr<Sequence> >&
|
||||
get_sequences();
|
||||
|
||||
void add_new_sequence(Glib::ustring name);
|
||||
|
||||
public:
|
||||
sigc::signal<void>& signal_sequence_list_changed();
|
||||
|
||||
private:
|
||||
|
||||
std::list< boost::shared_ptr<Sequence> > sequences;
|
||||
|
||||
sigc::signal<void> sequenceListChangedSignal;
|
||||
lumiera::observable_list< boost::shared_ptr<Sequence> > sequences;
|
||||
};
|
||||
|
||||
} // namespace model
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ TimelinePanel::TimelinePanel(model::Project *const owner_project) :
|
|||
// mem_fun(this, &TimelinePanel::on_playback_period_drag_released));
|
||||
|
||||
// Hook up notifications
|
||||
project->signal_sequence_list_changed().connect(
|
||||
project->get_sequences().signal_changed().connect(
|
||||
mem_fun(this, &TimelinePanel::on_sequence_list_changed));
|
||||
|
||||
// Setup the notebook
|
||||
|
|
|
|||
Loading…
Reference in a new issue