comparison view/View.h @ 1052:834e94eb1bca 3.0-integration

Merge from branch "alignment-simple"
author Chris Cannam
date Thu, 21 Apr 2016 15:06:05 +0100
parents f535f6e5dbb0
children 5144d7185fb5
comparison
equal deleted inserted replaced
1050:3691af49291c 1052:834e94eb1bca
371 371
372 void centreFrameChanged(sv_frame_t frame, 372 void centreFrameChanged(sv_frame_t frame,
373 bool globalScroll, 373 bool globalScroll,
374 PlaybackFollowMode followMode); 374 PlaybackFollowMode followMode);
375 375
376 void zoomLevelChanged(int, bool); 376 void zoomLevelChanged(int level, bool locked);
377 377
378 void contextHelpChanged(const QString &); 378 void contextHelpChanged(const QString &);
379 379
380 public slots: 380 public slots:
381 virtual void modelChanged(); 381 virtual void modelChanged();