From 4c0c60ff8325794261e3c56f0aa2e7c811333d5a Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Mon, 26 Jun 2006 21:19:47 +0000 Subject: [PATCH] added time-roll git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@161 0778d3d1-df1d-0410-868b-ea421aaaa00d --- include/engine.h | 7 +++++++ src/core/engine.cpp | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/engine.h b/include/engine.h index d2e97a0b3..30a876aa2 100644 --- a/include/engine.h +++ b/include/engine.h @@ -33,6 +33,7 @@ class mixer; class pianoRoll; class projectNotes; class songEditor; +class timeRoll; class engine @@ -97,6 +98,11 @@ public: return( m_projectJournal ); } + inline timeRoll * getTimeRoll( void ) + { + return( m_timeRoll ); + } + private: bool m_hasGUI; @@ -108,6 +114,7 @@ private: pianoRoll * m_pianoRoll; projectNotes * m_projectNotes; projectJournal * m_projectJournal; + timeRoll * m_timeRoll; } ; diff --git a/src/core/engine.cpp b/src/core/engine.cpp index 03307137e..1b9d1d4bf 100644 --- a/src/core/engine.cpp +++ b/src/core/engine.cpp @@ -34,6 +34,7 @@ #include "preset_preview_play_handle.h" #include "project_notes.h" #include "song_editor.h" +#include "time_roll.h" engine::engine( const bool _has_gui ) : @@ -43,7 +44,8 @@ engine::engine( const bool _has_gui ) : m_songEditor( NULL ), m_bbEditor( NULL ), m_pianoRoll( NULL ), - m_projectJournal( NULL ) + m_projectJournal( NULL ), + m_timeRoll( NULL ) { m_projectJournal = new projectJournal( this ); m_mainWindow = new mainWindow( this ); @@ -52,6 +54,7 @@ engine::engine( const bool _has_gui ) : m_projectNotes = new projectNotes( this ); m_bbEditor = new bbEditor( this ); m_pianoRoll = new pianoRoll( this ); + m_timeRoll = new timeRoll( this ); m_mixer->initDevices(); @@ -71,6 +74,7 @@ engine::~engine() delete m_songEditor; delete m_bbEditor; delete m_pianoRoll; + delete m_timeRoll; presetPreviewPlayHandle::cleanUp( this );