projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make waveforms centered when height hits NAME_HIGHLIGHT_THRESHOLD
[ardour.git]
/
gtk2_ardour
/
imageframe_view.cc
diff --git
a/gtk2_ardour/imageframe_view.cc
b/gtk2_ardour/imageframe_view.cc
index 9ab7c185a5cb017004f968df763c4e549c889d4c..ac17a7cc1a2bf8d13b1b0739c053289450d5406e 100644
(file)
--- a/
gtk2_ardour/imageframe_view.cc
+++ b/
gtk2_ardour/imageframe_view.cc
@@
-56,7
+56,7
@@
sigc::signal<void,ImageFrameView*> ImageFrameView::GoingAway;
* @param height the width of the origianl rgb_data image data
* @param num_channels the number of color channels within rgb_data
*/
* @param height the width of the origianl rgb_data image data
* @param num_channels the number of color channels within rgb_data
*/
-ImageFrameView::ImageFrameView(
stringcr_t
item_id,
+ImageFrameView::ImageFrameView(
const string &
item_id,
ArdourCanvas::Group *parent,
ImageFrameTimeAxis* tv,
ImageFrameTimeAxisGroup* item_group,
ArdourCanvas::Group *parent,
ImageFrameTimeAxis* tv,
ImageFrameTimeAxisGroup* item_group,
@@
-172,16
+172,15
@@
delete imageframe;
* @return true if the position change was a success, false otherwise
*/
bool
* @return true if the position change was a success, false otherwise
*/
bool
-ImageFrameView::set_position(jack_nframes_t pos, void* src)
+ImageFrameView::set_position(jack_nframes_t pos, void* src
, double* delta
)
{
jack_nframes_t old_pos = frame_position ;
// do the standard stuff
{
jack_nframes_t old_pos = frame_position ;
// do the standard stuff
- bool ret = TimeAxisViewItem::set_position(pos, src) ;
+ bool ret = TimeAxisViewItem::set_position(pos, src
, delta
) ;
// everything went ok with the standard stuff?
// everything went ok with the standard stuff?
- if(ret)
- {
+ if (ret) {
/* move each of our associated markers with this ImageFrameView */
for (MarkerViewList::iterator i = marker_view_list.begin(); i != marker_view_list.end(); ++i)
{
/* move each of our associated markers with this ImageFrameView */
for (MarkerViewList::iterator i = marker_view_list.begin(); i != marker_view_list.end(); ++i)
{
@@
-307,7
+306,7
@@
ImageFrameView::add_marker_view_item(MarkerView* item, void* src)
* @return the removed marker item
*/
MarkerView*
* @return the removed marker item
*/
MarkerView*
-ImageFrameView::remove_named_marker_view_item(
stringcr_t
markerId, void* src)
+ImageFrameView::remove_named_marker_view_item(
const string &
markerId, void* src)
{
MarkerView* mv = 0 ;
MarkerViewList::iterator i = marker_view_list.begin() ;
{
MarkerView* mv = 0 ;
MarkerViewList::iterator i = marker_view_list.begin() ;
@@
-359,7
+358,7
@@
ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src)
* @param markId the id/name of the item to search for
*/
bool
* @param markId the id/name of the item to search for
*/
bool
-ImageFrameView::has_marker_view_item(
stringcr_t
mname)
+ImageFrameView::has_marker_view_item(
const string &
mname)
{
bool result = false ;
{
bool result = false ;