comparison view/ViewManager.cpp @ 806:4c8ca536b54f warnfix_no_size_t

Some more unsigned/long removal

 
 ViewManager::~ViewManager()
 {
 }
 
-unsigned long
+int
 ViewManager::getGlobalCentreFrame() const
 {
 #ifdef DEBUG_VIEW_MANAGER
     cerr << "ViewManager::getGlobalCentreFrame: returning " << m_globalCentreFrame << endl;
 #endif
     return m_globalCentreFrame;
 }
 
 void
-ViewManager::setGlobalCentreFrame(unsigned long f)
+ViewManager::setGlobalCentreFrame(int f)
 {
 #ifdef DEBUG_VIEW_MANAGER
     cerr << "ViewManager::setGlobalCentreFrame to " << f << endl;
 #endif
     m_globalCentreFrame = f;
     emit globalCentreFrameChanged(f);
 }
 
-unsigned long
+int
 ViewManager::getGlobalZoom() const
 {
 #ifdef DEBUG_VIEW_MANAGER
     cerr << "ViewManager::getGlobalZoom: returning " << m_globalZoom << endl;
 #endif
     return m_globalZoom;
 }
 
-unsigned long
+int
 ViewManager::getPlaybackFrame() const
 {
     if (m_playSource && m_playSource->isPlaying()) {
 	m_playbackFrame = m_playSource->getCurrentPlayingFrame();
     }
     return m_playbackFrame;
 }
 
 void
-ViewManager::setPlaybackFrame(unsigned long f)
+ViewManager::setPlaybackFrame(int f)
 {
     if (m_playbackFrame != f) {
 	m_playbackFrame = f;
 	emit playbackFrameChanged(f);
 	if (m_playSource && m_playSource->isPlaying()) {

 ViewManager::setPlaybackModel(Model *model)
 {
     m_playbackModel = model;
 }
 
-size_t
-ViewManager::alignPlaybackFrameToReference(size_t frame) const
+int
+ViewManager::alignPlaybackFrameToReference(int frame) const
 {
     if (!m_playbackModel) return frame;
     else return m_playbackModel->alignToReference(frame);
 }
 
-size_t
-ViewManager::alignReferenceToPlaybackFrame(size_t frame) const
+int
+ViewManager::alignReferenceToPlaybackFrame(int frame) const
 {
     if (!m_playbackModel) return frame;
     else return m_playbackModel->alignFromReference(frame);
 }
 

     if (!quietly) {
         emit selectionChangedByUser();
     }
 }
 
-size_t
-ViewManager::constrainFrameToSelection(size_t frame) const
+int
+ViewManager::constrainFrameToSelection(int frame) const
 {
     MultiSelection::SelectionList sl = getSelections();
     if (sl.empty()) return frame;
 
     for (MultiSelection::SelectionList::const_iterator i = sl.begin();

     if (m_newSelection.getSelections().size() > 1) return tr("Select Multiple Regions");
     else return tr("Select Region");
 }
 
 Selection
-ViewManager::getContainingSelection(size_t frame, bool defaultToFollowing) const
+ViewManager::getContainingSelection(int frame, bool defaultToFollowing) const
 {
     return m_selections.getContainingSelection(frame, defaultToFollowing);
 }
 
 void

         if (mode) emit activity(tr("Switch on Alignment mode"));
         else emit activity(tr("Switch off Alignment mode"));
     }
 }
 
-size_t 
+int 
 ViewManager::getPlaybackSampleRate() const
 {
     if (m_playSource) {
         return m_playSource->getSourceSampleRate();
     }
     return 0;
 }
 
-size_t
+int
 ViewManager::getOutputSampleRate() const
 {
     if (m_playSource) {
 	return m_playSource->getTargetSampleRate();
     }

 {
     return m_playSource && m_playSource->isPlaying();
 }
 
 void
-ViewManager::viewCentreFrameChanged(unsigned long f, bool locked,
+ViewManager::viewCentreFrameChanged(int f, bool locked,
                                     PlaybackFollowMode mode)
 {
     View *v = dynamic_cast<View *>(sender());
 
 #ifdef DEBUG_VIEW_MANAGER

 
     seek(f);
 }
 
 void
-ViewManager::seek(unsigned long f)
+ViewManager::seek(int f)
 {
 #ifdef DEBUG_VIEW_MANAGER 
     cerr << "ViewManager::seek(" << f << ")" << endl;
 #endif
 
     if (m_playSource && m_playSource->isPlaying()) {
-	unsigned long playFrame = m_playSource->getCurrentPlayingFrame();
-	unsigned long diff = std::max(f, playFrame) - std::min(f, playFrame);
+	int playFrame = m_playSource->getCurrentPlayingFrame();
+	int diff = std::max(f, playFrame) - std::min(f, playFrame);
 	if (diff > 20000) {
 	    m_playbackFrame = f;
 	    m_playSource->play(f);
 #ifdef DEBUG_VIEW_MANAGER 
 	    cerr << "ViewManager::considerSeek: reseeking from " << playFrame << " to " << f << endl;

         }
     }
 }
 
 void
-ViewManager::viewZoomLevelChanged(unsigned long z, bool locked)
+ViewManager::viewZoomLevelChanged(int z, bool locked)
 {
     View *v = dynamic_cast<View *>(sender());
 
     if (!v) {
         SVDEBUG << "ViewManager::viewZoomLevelChanged: WARNING: sender is not a view" << endl;