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

added pop-up panel for playlist editing functions move up, move down,

Browse source 
and remove
This commit is contained in:
fgerlits 2005-07-21 15:14:40 +00:00
parent 19dd690732
commit 06d4859af2
8 changed files with 334 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

24
livesupport/modules/core/include/LiveSupport/Core/Playlist.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.39 $
Version : $Revision: 1.40 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Playlist.h,v $
------------------------------------------------------------------------------*/
@ -128,7 +128,7 @@ using namespace boost::posix_time;
* </code></pre>
*
* @author $Author: fgerlits $
* @version $Revision: 1.39 $
* @version $Revision: 1.40 $
*/
class Playlist : public Configurable,
public Playable
@ -176,17 +176,6 @@ class Playlist : public Configurable,
*/
Ptr<PlaylistElementListType>::Ref elementList;
/**
* Add a new playlist element to the playlist.
*
* @param playlistElement the new playlist element to be added
* @exception std::invalid_argument if the playlist already contains
* a playlist element with the same relative offset
*/
void
addPlaylistElement(Ptr<PlaylistElement>::Ref playlistElement)
throw (std::invalid_argument);
/**
* A saved copy of this playlist.
*/
@ -626,6 +615,15 @@ class Playlist : public Configurable,
= Ptr<FadeInfo>::Ref())
throw ();
/**
* Add a new playlist element to the playlist.
*
* @param playlistElement the new playlist element to be added
*/
void
addPlaylistElement(Ptr<PlaylistElement>::Ref playlistElement)
throw ();
/**
* Set the fade in / fade out info for a playlist element.
*

23
livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h
View file

@ -21,8 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: maroy $
Version : $Revision: 1.13 $
Author : $Author: fgerlits $
Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/PlaylistElement.h,v $
------------------------------------------------------------------------------*/
@ -103,8 +103,8 @@ class Playlist;
* &lt;!ATTLIST playlistElement relativeOffset NMTOKEN #REQUIRED &gt;
* </code></pre>
*
* @author $Author: maroy $
* @version $Revision: 1.13 $
* @author $Author: fgerlits $
* @version $Revision: 1.14 $
*/
class PlaylistElement : public Configurable
{
@ -297,6 +297,21 @@ class PlaylistElement : public Configurable
return id;
}
/**
* Set the relative offset of the playlist element.
* Note: this is very dangerous; use only if you know what you are
* doing. Never ever change the relative offset of a PlaylistElement
* which is contained in a Playlist.
*
* @param newOffset the new relative offset of the element.
*/
void
setRelativeOffset(Ptr<time_duration>::Ref newOffset)
throw ()
{
relativeOffset = newOffset;
}
/**
* Return the relative offset of the playlist element.
*

4
livesupport/modules/core/src/Playlist.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.38 $
Version : $Revision: 1.39 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/Playlist.cxx,v $
------------------------------------------------------------------------------*/
@ -431,7 +431,7 @@ Playlist :: configure(const xmlpp::Element & element)
*----------------------------------------------------------------------------*/
void
Playlist::addPlaylistElement(Ptr<PlaylistElement>::Ref playlistElement)
throw (std::invalid_argument)
throw ()
{
Ptr<const time_duration>::Ref relativeOffset
= playlistElement->getRelativeOffset();

30
livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.26 $
Version : $Revision: 1.27 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $
------------------------------------------------------------------------------*/
@ -387,19 +387,7 @@ ScratchpadWindow :: onEntryClicked (GdkEventButton * event) throw ()
/*------------------------------------------------------------------------------
* Event handler for the Remove menu item selected from the entry conext menu
*----------------------------------------------------------------------------*/
void
ScratchpadWindow :: onRemoveItem(void) throw ()
{
Ptr<Playable>::Ref playable = currentRow[modelColumns.playableColumn];
removeItem(playable->getId());
showContents();
}
/*------------------------------------------------------------------------------
* Event handler for the Up menu item selected from the entry conext menu
* Event handler for the Up menu item selected from the entry context menu
*----------------------------------------------------------------------------*/
void
ScratchpadWindow :: onUpItem(void) throw ()
@ -435,7 +423,7 @@ ScratchpadWindow :: onUpItem(void) throw ()
/*------------------------------------------------------------------------------
* Event handler for the Down menu item selected from the entry conext menu
* Event handler for the Down menu item selected from the entry context menu
*----------------------------------------------------------------------------*/
void
ScratchpadWindow :: onDownItem(void) throw ()
@ -473,6 +461,18 @@ ScratchpadWindow :: onDownItem(void) throw ()
}
/*------------------------------------------------------------------------------
* Event handler for the Remove menu item selected from the entry context menu
*----------------------------------------------------------------------------*/
void
ScratchpadWindow :: onRemoveItem(void) throw ()
{
Ptr<Playable>::Ref playable = currentRow[modelColumns.playableColumn];
removeItem(playable->getId());
showContents();
}
/*------------------------------------------------------------------------------
* Remove an item from the Scratchpad
*----------------------------------------------------------------------------*/

21
livesupport/products/gLiveSupport/src/ScratchpadWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.10 $
Version : $Revision: 1.11 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.h,v $
------------------------------------------------------------------------------*/
@ -73,7 +73,7 @@ using namespace LiveSupport::Widgets;
* playlists.
*
* @author $Author: fgerlits $
* @version $Revision: 1.10 $
* @version $Revision: 1.11 $
*/
class ScratchpadWindow : public WhiteWindow,
public LocalizedObject
@ -87,7 +87,7 @@ class ScratchpadWindow : public WhiteWindow,
* Lists one clip per row.
*
* @author $Author: fgerlits $
* @version $Revision: 1.10 $
* @version $Revision: 1.11 $
*/
class ModelColumns : public PlayableTreeModelColumnRecord
{
@ -216,19 +216,13 @@ class ScratchpadWindow : public WhiteWindow,
/**
* Signal handler for the mouse clicked on one of the entries.
* This is used to pop up the right-click context menu.
*
* @param event the button event recieved
*/
virtual void
onEntryClicked(GdkEventButton * event) throw ();
/**
* Signal handler for the "remove" menu item selected from
* the entry context menu.
*/
virtual void
onRemoveItem(void) throw ();
/**
* Signal handler for the "up" menu item selected from
* the entry context menu.
@ -243,6 +237,13 @@ class ScratchpadWindow : public WhiteWindow,
virtual void
onDownItem(void) throw ();
/**
* Signal handler for the "remove" menu item selected from
* the entry context menu.
*/
virtual void
onRemoveItem(void) throw ();
/**
* Signal handler for the "edit playlist" menu item selected from
* the entry context menu.

181
livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.24 $
Version : $Revision: 1.25 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx,v $
------------------------------------------------------------------------------*/
@ -69,8 +69,8 @@ SimplePlaylistManagementWindow :: SimplePlaylistManagementWindow (
Colors::White,
WidgetFactory::getInstance()->getWhiteWindowCorners()),
LocalizedObject(bundle),
gLiveSupport(gLiveSupport),
isPlaylistModified(false)
isPlaylistModified(false),
gLiveSupport(gLiveSupport)
{
Ptr<WidgetFactory>::Ref wf = WidgetFactory::getInstance();
@ -128,9 +128,33 @@ SimplePlaylistManagementWindow :: SimplePlaylistManagementWindow (
std::exit(1);
}
entriesView->signal_button_press_event().connect_notify(sigc::mem_fun(
*this, &SimplePlaylistManagementWindow::onEntryClicked ));
entriesView->signalCellEdited().connect(sigc::mem_fun(
*this, &SimplePlaylistManagementWindow::onFadeInfoEdited ));
// create the right-click entry context menu
rightClickMenu = Gtk::manage(new Gtk::Menu());
Gtk::Menu::MenuList& rightClickMenuList = rightClickMenu->items();
try {
rightClickMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("upMenuItem"),
sigc::mem_fun(*this,
&SimplePlaylistManagementWindow::onUpItem)));
rightClickMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("downMenuItem"),
sigc::mem_fun(*this,
&SimplePlaylistManagementWindow::onDownItem)));
rightClickMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("removeMenuItem"),
sigc::mem_fun(*this,
&SimplePlaylistManagementWindow::onRemoveItem)));
} catch (std::invalid_argument &e) {
std::cerr << e.what() << std::endl;
std::exit(1);
}
// construct the "lock fades" check button
Ptr<Glib::ustring>::Ref lockFadesCheckButtonLabel;
try {
@ -355,25 +379,25 @@ SimplePlaylistManagementWindow :: showContents(void) throw ()
entriesModel->clear();
rowNumber = 0;
for (it = playlist->begin(); it != playlist->end(); ++it) {
Ptr<PlaylistElement>::Ref
playlistElem = it->second;
Ptr<Playable>::Ref playable = playlistElem->getPlayable();
Ptr<PlaylistElement>::Ref playlistElement
= it->second;
Ptr<Playable>::Ref playable = playlistElement->getPlayable();
Gtk::TreeModel::Row row = *(entriesModel->append());
row[modelColumns.playlistElementColumn]
= playlistElement;
row[modelColumns.rowNumberColumn]
= rowNumber++;
row[modelColumns.idColumn]
= playable->getId();
row[modelColumns.startColumn]
= *TimeConversion::timeDurationToHhMmSsString(
playlistElem->getRelativeOffset());
playlistElement->getRelativeOffset());
row[modelColumns.titleColumn]
= Glib::Markup::escape_text(*playable->getTitle());
row[modelColumns.lengthColumn]
= *TimeConversion::timeDurationToHhMmSsString(
playable->getPlaylength());
Ptr<FadeInfo>::Ref fadeInfo = playlistElem->getFadeInfo();
Ptr<FadeInfo>::Ref fadeInfo = playlistElement->getFadeInfo();
Ptr<time_duration>::Ref fadeIn, fadeOut;
if (fadeInfo) {
fadeIn = fadeInfo->getFadeIn();
@ -546,3 +570,140 @@ SimplePlaylistManagementWindow :: onPlaylistModified(void) throw()
isPlaylistModified = true;
}
/*------------------------------------------------------------------------------
* Event handler for an entry being clicked in the list
*----------------------------------------------------------------------------*/
void
SimplePlaylistManagementWindow :: onEntryClicked(GdkEventButton * event)
throw()
{
if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
Gtk::TreePath currentPath;
Gtk::TreeViewColumn * column;
int cell_x,
cell_y;
bool foundValidRow = entriesView->get_path_at_pos(
int(event->x), int(event->y),
currentPath, column,
cell_x, cell_y);
if (foundValidRow) {
currentItem = entriesModel->get_iter(currentPath);
if (currentItem) {
rightClickMenu->popup(event->button, event->time);
}
}
}
}
/*------------------------------------------------------------------------------
* Event handler for the Up menu item selected from the context menu.
*----------------------------------------------------------------------------*/
void
SimplePlaylistManagementWindow :: onUpItem(void) throw()
{
if (currentItem && currentItem != entriesModel->children().begin()) {
Gtk::TreeIter previousItem = currentItem;
--previousItem;
swapPlaylistElements(previousItem, currentItem);
isPlaylistModified = true;
showContents();
}
}
/*------------------------------------------------------------------------------
* Event handler for the Down menu item selected from the context menu.
*----------------------------------------------------------------------------*/
void
SimplePlaylistManagementWindow :: onDownItem(void) throw()
{
if (currentItem) {
Gtk::TreeIter nextItem = currentItem;
++nextItem;
if (nextItem) {
swapPlaylistElements(currentItem, nextItem);
isPlaylistModified = true;
showContents();
}
}
}
/*------------------------------------------------------------------------------
* Swap two playlist elements in the edited playlist.
*----------------------------------------------------------------------------*/
void
SimplePlaylistManagementWindow :: swapPlaylistElements(
Gtk::TreeIter firstIter,
Gtk::TreeIter secondIter)
throw()
{
Ptr<PlaylistElement>::Ref
firstElement = (*firstIter) [modelColumns.playlistElementColumn];
Ptr<PlaylistElement>::Ref
secondElement = (*secondIter)[modelColumns.playlistElementColumn];
// remove the two playlist elements
Ptr<Playlist>::Ref playlist = gLiveSupport->getEditedPlaylist();
playlist->removePlaylistElement(firstElement->getId());
playlist->removePlaylistElement(secondElement->getId());
// swap the relative offsets so that elt2.begin <-- elt1.begin
// and elt1.end <-- elt2.end
Ptr<time_duration>::Ref firstStart = firstElement->getRelativeOffset();
Ptr<time_duration>::Ref secondStart(new time_duration(
*secondElement->getRelativeOffset()
+ *secondElement->getPlayable()
->getPlaylength()
- *firstElement->getPlayable()
->getPlaylength() ));
firstElement->setRelativeOffset(secondStart);
secondElement->setRelativeOffset(firstStart);
// move fades around if they seem to be simple crossfades
Ptr<time_duration>::Ref beginFade = firstElement->getFadeInfo()
->getFadeIn();
Ptr<time_duration>::Ref midFade1 = firstElement->getFadeInfo()
->getFadeOut();
Ptr<time_duration>::Ref midFade2 = secondElement->getFadeInfo()
->getFadeIn();
Ptr<time_duration>::Ref endFade = secondElement->getFadeInfo()
->getFadeOut();
if (*midFade1 == *midFade2) {
Ptr<FadeInfo>::Ref firstFadeInfo (new FadeInfo(beginFade, midFade1));
Ptr<FadeInfo>::Ref secondFadeInfo(new FadeInfo(midFade1, endFade ));
firstElement->setFadeInfo(secondFadeInfo);
secondElement->setFadeInfo(firstFadeInfo);
}
// add the playlist elements back in
playlist->addPlaylistElement(firstElement);
playlist->addPlaylistElement(secondElement);
// Note:
// removing and then adding is necessary to make sure that the playlist
// elements are correctly indexed by their relative offset in the playlist.
}
/*------------------------------------------------------------------------------
* Event handler for the Remove menu item selected from the context menu.
*----------------------------------------------------------------------------*/
void
SimplePlaylistManagementWindow :: onRemoveItem(void) throw()
{
Ptr<Playlist>::Ref playlist = gLiveSupport->getEditedPlaylist();
Ptr<PlaylistElement>::Ref playlistElement
= (*currentItem)[modelColumns.playlistElementColumn];
playlist->removePlaylistElement(playlistElement->getId());
isPlaylistModified = true;
showContents();
}

142
livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $
Version : $Revision: 1.12 $
Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.h,v $
------------------------------------------------------------------------------*/
@ -88,7 +88,7 @@ using namespace LiveSupport::Widgets;
* </code></pre>
*
* @author $Author: fgerlits $
* @version $Revision: 1.12 $
* @version $Revision: 1.13 $
*/
class SimplePlaylistManagementWindow : public WhiteWindow,
public LocalizedObject
@ -101,6 +101,24 @@ class SimplePlaylistManagementWindow : public WhiteWindow,
enum { fadeInColumnId,
fadeOutColumnId };
/**
* A flag set to true when the edited playlist is modified.
*/
bool isPlaylistModified;
/**
* A flag controlled by the "lock fades" check button.
* This determines whether the fade-out of a clip is assumed to
* be equal to the fade-in of the next clip.
*/
bool areFadesLocked;
/**
* An iterator pointing to the current row, for popup functions.
* It is set by onEntryClicked(), before popping up the menu.
*/
Gtk::TreeIter currentItem;
/**
* Signal handler for the title being edited.
*/
@ -125,6 +143,65 @@ class SimplePlaylistManagementWindow : public WhiteWindow,
void
onPlaylistModified(void) throw();
/**
* Signal handler for the mouse clicked on one of the entries.
* This is used to pop up the right-click context menu.
*
* @param event the button event recieved
*/
void
onEntryClicked(GdkEventButton * event) throw ();
/**
* Signal handler for the save button clicked.
*/
void
onSaveButtonClicked(void) throw ();
/**
* Signal handler for the close button clicked.
*/
void
onCloseButtonClicked(void) throw ();
/**
* Signal handler for the "lock fades" check button toggled.
*/
void
onLockFadesCheckButtonClicked(void) throw ();
/**
* Signal handler for the "up" menu item selected from
* the right-click context menu.
*/
void
onUpItem(void) throw ();
/**
* Signal handler for the "down" menu item selected from
* the right-click context menu.
*/
void
onDownItem(void) throw ();
/**
* Swap two playlist elements in the edited playlist.
* This is used by onUpItem() and onDownItem().
*
* @param firstIter the first item, to be swapped...
* @param secondIter ... with this second item
*/
void
swapPlaylistElements(Gtk::TreeIter firstIter,
Gtk::TreeIter secondIter) throw ();
/**
* Signal handler for the "remove" menu item selected from
* the right-click context menu.
*/
virtual void
onRemoveItem(void) throw ();
/**
* Set the fade in of a playlist element.
*/
@ -165,6 +242,14 @@ class SimplePlaylistManagementWindow : public WhiteWindow,
void
closeWindow(void) throw();
/**
* Save the edited playlist.
*
* @return true if the playlist was saved successully.
*/
virtual bool
savePlaylist(void) throw ();
protected:
@ -173,16 +258,11 @@ class SimplePlaylistManagementWindow : public WhiteWindow,
* Lists one playlist entry per row.
*
* @author $Author: fgerlits $
* @version $Revision: 1.12 $
* @version $Revision: 1.13 $
*/
class ModelColumns : public ZebraTreeModelColumnRecord
{
public:
/**
* The column for the id of the audio clip or playlist.
*/
Gtk::TreeModelColumn<Ptr<const UniqueId>::Ref> idColumn;
/**
* The column for the start of the playlist entry.
*/
@ -208,17 +288,23 @@ class SimplePlaylistManagementWindow : public WhiteWindow,
*/
Gtk::TreeModelColumn<Glib::ustring> fadeOutColumn;
/**
* The column for the pointer to the playlist element.
*/
Gtk::TreeModelColumn<Ptr<PlaylistElement>::Ref>
playlistElementColumn;
/**
* Constructor.
*/
ModelColumns(void) throw ()
{
add(idColumn);
add(startColumn);
add(titleColumn);
add(fadeInColumn);
add(lengthColumn);
add(fadeOutColumn);
add(playlistElementColumn);
}
};
@ -279,42 +365,10 @@ class SimplePlaylistManagementWindow : public WhiteWindow,
Ptr<DialogWindow>::Ref dialogWindow;
/**
* A flag set to true when the edited playlist is modified.
* The right-click context menu that comes up when right-clicking
* a playlist element.
*/
bool isPlaylistModified;
/**
* A flag controlled by the "lock fades" check button.
* This determines whether the fade-out of a clip is assumed to
* be equal to the fade-in of the next clip.
*/
bool areFadesLocked;
/**
* Save the edited playlist.
*
* @return true if the playlist was saved successully.
*/
virtual bool
savePlaylist(void) throw ();
/**
* Signal handler for the save button clicked.
*/
virtual void
onSaveButtonClicked(void) throw ();
/**
* Signal handler for the close button clicked.
*/
virtual void
onCloseButtonClicked(void) throw ();
/**
* Signal handler for the "lock fades" check button toggled.
*/
virtual void
onLockFadesCheckButtonClicked(void) throw ();
Gtk::Menu * rightClickMenu;
public:

5
livesupport/products/gLiveSupport/var/root.txt
View file

@ -120,6 +120,11 @@ root:table
lockFadesCheckButtonLabel:string
{ "Lock fade-out to following fade-in" }
statusBar:string { "status bar" }
upMenuItem:string { "Move _Up" }
downMenuItem:string { "Move D_own" }
removeMenuItem:string { "_Remove" }
playlistSavedMsg:string { "Saved playlist ''{0}''." }
savePlaylistDialogMsg:string { "Do you want to save the playlist?" }
emptyTitleErrorMsg:string { "Please enter a title." }