Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moved live mode window contents from GLiveSupport to LiveModeWindow

Browse source
This commit is contained in:
fgerlits 2005-05-03 18:14:00 +00:00
parent aa921acaa9
commit 3013c552a7
6 changed files with 66 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

7
livesupport/products/gLiveSupport/src/GLiveSupport.cxx
View file

@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: maroy $ Author : $Author: fgerlits $
Version : $Revision: 1.35 $ Version : $Revision: 1.36 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -582,8 +582,7 @@ LiveSupport :: GLiveSupport ::
GLiveSupport :: addToLiveMode(Ptr<Playable>::Ref playable) GLiveSupport :: addToLiveMode(Ptr<Playable>::Ref playable)
throw () throw ()
{ {
liveModeContents->push_back(playable); masterPanel->updateLiveModeWindow(playable);
masterPanel->updateLiveModeWindow();
addToScratchPad(playable); addToScratchPad(playable);
} }

25
livesupport/products/gLiveSupport/src/GLiveSupport.h
View file

@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: maroy $ Author : $Author: fgerlits $
Version : $Revision: 1.29 $ Version : $Revision: 1.30 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -100,8 +100,8 @@ class MasterPanelWindow;
* <code>schedulerClientFactory</code> elements see their * <code>schedulerClientFactory</code> elements see their
* respective documentation. * respective documentation.
* *
* @author $Author: maroy $ * @author $Author: fgerlits $
* @version $Revision: 1.29 $ * @version $Revision: 1.30 $
* @see LocalizedObject#getBundle(const xmlpp::Element &) * @see LocalizedObject#getBundle(const xmlpp::Element &)
* @see AuthenticationClientFactory * @see AuthenticationClientFactory
* @see StorageClientFactory * @see StorageClientFactory
@ -183,11 +183,6 @@ class GLiveSupport : public LocalizedConfigurable,
*/ */
Ptr<PlayableList>::Ref scratchpadContents; Ptr<PlayableList>::Ref scratchpadContents;
/**
* The contents of the Live Mode, stored as a list.
*/
Ptr<PlayableList>::Ref liveModeContents;
/** /**
* The one and only playlist that may be edited at any one time. * The one and only playlist that may be edited at any one time.
*/ */
@ -240,7 +235,6 @@ class GLiveSupport : public LocalizedConfigurable,
GLiveSupport(void) throw () GLiveSupport(void) throw ()
{ {
scratchpadContents.reset(new PlayableList()); scratchpadContents.reset(new PlayableList());
liveModeContents. reset(new PlayableList());
} }
/** /**
@ -456,17 +450,6 @@ class GLiveSupport : public LocalizedConfigurable,
void void
addToLiveMode(Ptr<Playable>::Ref playable) throw (); addToLiveMode(Ptr<Playable>::Ref playable) throw ();
/**
* Return the Live Mode contents.
*
* @return the list holding the Live Mode contents.
*/
Ptr<PlayableList>::Ref
getLiveModeContents(void) throw ()
{
return liveModeContents;
}
/** /**
* Return the currently edited playlist. * Return the currently edited playlist.
* *

168
livesupport/products/gLiveSupport/src/LiveModeWindow.cxx
View file

@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: maroy $ Author : $Author: fgerlits $
Version : $Revision: 1.4 $ Version : $Revision: 1.5 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -88,9 +88,6 @@ LiveModeWindow :: LiveModeWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
std::exit(1); std::exit(1);
} }
treeView->columns_autosize();
// register the signal handler for treeview entries being clicked // register the signal handler for treeview entries being clicked
treeView->signal_button_press_event().connect_notify(sigc::mem_fun(*this, treeView->signal_button_press_event().connect_notify(sigc::mem_fun(*this,
@ -138,47 +135,28 @@ LiveModeWindow :: LiveModeWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
set_default_size(530, 300); set_default_size(530, 300);
set_modal(false); set_modal(false);
property_window_position().set_value(Gtk::WIN_POS_NONE); property_window_position().set_value(Gtk::WIN_POS_NONE);
set_resizable(true);
showContents();
show_all_children(); show_all_children();
} }
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Show all audio clips * Add a new item to the Live Mode Window.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
LiveModeWindow :: showContents(void) throw () LiveModeWindow :: addItem(Ptr<Playable>::Ref playable) throw ()
{ {
Ptr<GLiveSupport::PlayableList>::Ref liveModeContents; int rowNumber = treeModel->children().size();
GLiveSupport::PlayableList::iterator it; Gtk::TreeModel::Row row = *(treeModel->append());
GLiveSupport::PlayableList::iterator end;
Ptr<Playable>::Ref playable;
Gtk::TreeModel::Row row;
liveModeContents = gLiveSupport->getLiveModeContents();
it = liveModeContents->begin();
end = liveModeContents->end();
treeModel->clear();
int rowNumber = 0;
while (it != end) { row[modelColumns.playableColumn] = playable;
playable = *it; row[modelColumns.titleColumn] = *playable->getTitle();
row = *(treeModel->append()); Ptr<Glib::ustring>::Ref
creator = playable->getMetadata("dc:creator");
row[modelColumns.playableColumn] = playable; row[modelColumns.creatorColumn] = creator ? *creator : "";
row[modelColumns.titleColumn] = *playable->getTitle(); row[modelColumns.lengthColumn] = to_simple_string(
Ptr<Glib::ustring>::Ref *playable->getPlaylength() );
creator = playable->getMetadata("dc:creator"); row[modelColumns.rowNumberColumn] = rowNumber;
row[modelColumns.creatorColumn] = creator ? *creator : "";
row[modelColumns.lengthColumn] = to_simple_string(
*playable->getPlaylength() );
row[modelColumns.rowNumberColumn] = rowNumber;
++it;
++rowNumber;
}
} }
@ -258,36 +236,17 @@ LiveModeWindow :: onUpMenuOption(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
Gtk::TreeModel::iterator iter = refSelection->get_selected(); Gtk::TreeModel::iterator iter = refSelection->get_selected();
if (iter) { if (iter && iter != treeModel->children().begin()) {
Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn]; Gtk::TreeModel::iterator previous = iter;
--previous;
Ptr<GLiveSupport::PlayableList>::Ref liveModeContents;
GLiveSupport::PlayableList::iterator it; int rowNumber = (*previous)[modelColumns.rowNumberColumn];
GLiveSupport::PlayableList::iterator end; (*iter) [modelColumns.rowNumberColumn] = rowNumber;
(*previous)[modelColumns.rowNumberColumn] = ++rowNumber;
liveModeContents = gLiveSupport->getLiveModeContents();
it = liveModeContents->begin(); treeModel->iter_swap(previous, iter);
end = liveModeContents->end();
while (it != end) {
Ptr<Playable>::Ref p= *it;
if (*p->getId() == *playable->getId()) {
// move one up, and insert the same before that
if (it == liveModeContents->begin()) {
break;
}
liveModeContents->insert(--it, playable);
// move back to what we've found, and erase it
liveModeContents->erase(++it);
showContents();
break;
}
it++;
}
} }
} }
@ -300,38 +259,18 @@ LiveModeWindow :: onDownMenuOption(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
Gtk::TreeModel::iterator iter = refSelection->get_selected(); Gtk::TreeModel::iterator iter = refSelection->get_selected();
if (iter) { if (iter) {
Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn]; Gtk::TreeModel::iterator next = iter;
++next;
if (next != treeModel->children().end()) {
int rowNumber = (*iter)[modelColumns.rowNumberColumn];
(*next)[modelColumns.rowNumberColumn] = rowNumber;
(*iter)[modelColumns.rowNumberColumn] = ++rowNumber;
Ptr<GLiveSupport::PlayableList>::Ref liveModeContents; treeModel->iter_swap(iter, next);
GLiveSupport::PlayableList::iterator it;
GLiveSupport::PlayableList::iterator end;
liveModeContents = gLiveSupport->getLiveModeContents();
it = liveModeContents->begin();
end = liveModeContents->end();
while (it != end) {
Ptr<Playable>::Ref p= *it;
if (*p->getId() == *playable->getId()) {
// move two down, and insert the same before that
++it;
if (it == end) {
break;
}
liveModeContents->insert(++it, playable);
// move back to what we've found, and erase it
--it;
--it;
liveModeContents->erase(--it);
showContents();
break;
}
it++;
} }
} }
} }
@ -345,39 +284,16 @@ LiveModeWindow :: onRemoveMenuOption(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
Gtk::TreeModel::iterator iter = refSelection->get_selected(); Gtk::TreeModel::iterator iter = refSelection->get_selected();
if (iter) { if (iter) {
Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn]; Gtk::TreeModel::iterator later = iter;
int rowNumber = (*iter)[modelColumns.rowNumberColumn];
removeItem(playable->getId()); for (++later; later != treeModel->children().end(); ++later) {
showContents(); (*later)[modelColumns.rowNumberColumn] = rowNumber++;
}
}
/*------------------------------------------------------------------------------
* Remove an item from the Scratchpad
*----------------------------------------------------------------------------*/
void
LiveModeWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw ()
{
Ptr<GLiveSupport::PlayableList>::Ref liveModeContents;
GLiveSupport::PlayableList::iterator it;
GLiveSupport::PlayableList::iterator end;
liveModeContents = gLiveSupport->getLiveModeContents();
it = liveModeContents->begin();
end = liveModeContents->end();
while (it != end) {
Ptr<Playable>::Ref playable = *it;
if (*playable->getId() == *id) {
liveModeContents->erase(it);
break;
} }
it++; treeModel->erase(iter);
} }
} }

18
livesupport/products/gLiveSupport/src/LiveModeWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.3 $ Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -72,7 +72,7 @@ using namespace LiveSupport::Widgets;
* playlists. * playlists.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.3 $ * @version $Revision: 1.4 $
*/ */
class LiveModeWindow : public WhiteWindow, public LocalizedObject class LiveModeWindow : public WhiteWindow, public LocalizedObject
{ {
@ -85,7 +85,7 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
* Lists one clip per row. * Lists one clip per row.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.3 $ * @version $Revision: 1.4 $
*/ */
class ModelColumns : public ZebraTreeModelColumnRecord class ModelColumns : public ZebraTreeModelColumnRecord
{ {
@ -201,14 +201,6 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
virtual void virtual void
onRemoveMenuOption(void) throw (); onRemoveMenuOption(void) throw ();
/**
* Remove an item from the Live Mode.
*
* @param id the id of the item to remove.
*/
void
removeItem(Ptr<const UniqueId>::Ref id) throw ();
public: public:
/** /**
@ -228,10 +220,10 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
~LiveModeWindow(void) throw (); ~LiveModeWindow(void) throw ();
/** /**
* Update the window contents, with the contents of the LiveMode. * Add a new item to the Live Mode Window.
*/ */
void void
showContents(void) throw (); addItem(Ptr<Playable>::Ref playable) throw ();
}; };
/* ================================================= external data structures */ /* ================================================= external data structures */

11
livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx
View file

@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: maroy $ Author : $Author: fgerlits $
Version : $Revision: 1.27 $ Version : $Revision: 1.28 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -332,7 +332,8 @@ MasterPanelWindow :: onUpdateTime(int dummy) throw ()
* The event when the Live Mode button has been clicked. * The event when the Live Mode button has been clicked.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
MasterPanelWindow :: updateLiveModeWindow(void) throw () MasterPanelWindow :: updateLiveModeWindow(Ptr<Playable>::Ref playable)
throw ()
{ {
if (!liveModeWindow.get()) { if (!liveModeWindow.get()) {
Ptr<ResourceBundle>::Ref bundle; Ptr<ResourceBundle>::Ref bundle;
@ -346,7 +347,9 @@ MasterPanelWindow :: updateLiveModeWindow(void) throw ()
liveModeWindow.reset(new LiveModeWindow(gLiveSupport, bundle)); liveModeWindow.reset(new LiveModeWindow(gLiveSupport, bundle));
} }
liveModeWindow->showContents(); if (playable) {
liveModeWindow->addItem(playable);
}
if (!liveModeWindow->is_visible()) { if (!liveModeWindow->is_visible()) {
liveModeWindow->show(); liveModeWindow->show();

8
livesupport/products/gLiveSupport/src/MasterPanelWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.15 $ Version : $Revision: 1.16 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -91,7 +91,7 @@ using namespace LiveSupport::Widgets;
* </code></pre> * </code></pre>
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.15 $ * @version $Revision: 1.16 $
*/ */
class MasterPanelWindow : public Gtk::Window, public LocalizedObject class MasterPanelWindow : public Gtk::Window, public LocalizedObject
{ {
@ -405,7 +405,9 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
* Update the Live Mode window. * Update the Live Mode window.
*/ */
void void
updateLiveModeWindow(void) throw (); updateLiveModeWindow(Ptr<Playable>::Ref playable
= Ptr<Playable>::Ref())
throw ();
/** /**
* Update the Scratchpad window. * Update the Scratchpad window.