← Back to branch summary

~ubuntu-branches/ubuntu/karmic/rosegarden/karmic

« back to all changes in this revision

Viewing changes to src/gui/rulers/MarkerRuler.h

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2008-05-02 00:33:44 UTC
  • mfrom: (1.1.7 upstream) (6.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080502003344-67vbfhgqx2yl0ksi
Tags: 1:1.7.0-1ubuntu1
https://launchpad.net/bugs/225849
* Merge from Debian unstable. (LP: #225849) Remaining Ubuntu changes:
  - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
    help documentation.
  - Change fftw3-dev to libfftw3-dev.
  - Update maintainer field as per spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/rulers/MarkerRuler.h
5
5
    Rosegarden
6
6
    A MIDI and audio sequencer and musical notation editor.
7
7
 
8
 
    This program is Copyright 2000-2007
 
8
    This program is Copyright 2000-2008
9
9
        Guillaume Laurent   <glaurent@telegraph-road.org>,
10
10
        Chris Cannam        <cannam@all-day-breakfast.com>,
11
11
        Richard Bown        <richard.bown@ferventsoftware.com>
79
79
    /// add a marker
80
80
    void addMarker(timeT);
81
81
    
82
 
    void deleteMarker(timeT, QString name, QString description);
 
82
    void deleteMarker(int, timeT, QString name, QString description);
83
83
 
84
84
    /// Set a loop range
85
85
    void setLoop(timeT, timeT);