allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2009-10-26 14:38:58 +00:00
parent 5dd8dc0db3
commit fa5aeb7892
52 changed files with 1231 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View File

@@ -24,7 +24,7 @@
#include <string>
#include <jack/types.h>
#include <control_protocol/smpte.h>
#include <control_protocol/timecode.h>
namespace ARDOUR {
class Session;
@@ -72,11 +72,11 @@ class BasicUI {
void rec_enable_toggle ();
void toggle_all_rec_enables ();
jack_nframes_t smpte_frames_per_hour ();
jack_nframes_t timecode_frames_per_hour ();
void smpte_time (jack_nframes_t where, SMPTE::Time&);
void smpte_to_sample (SMPTE::Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes) const;
void sample_to_smpte (jack_nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const;
void timecode_time (jack_nframes_t where, Timecode::Time&);
void timecode_to_sample (Timecode::Time& timecode, jack_nframes_t& sample, bool use_offset, bool use_subframes) const;
void sample_to_timecode (jack_nframes_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const;
protected:
BasicUI ();

36
libs/surfaces/control_protocol/control_protocol/smpte.h → libs/surfaces/control_protocol/control_protocol/timecode.h
View File

@@ -16,12 +16,12 @@
675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ardour_smpte_h__
#define __ardour_smpte_h__
#ifndef __ardour_timecode_h__
#define __ardour_timecode_h__
#include <inttypes.h>
namespace SMPTE {
namespace Timecode {
enum Wrap {
NONE = 0,
@@ -36,11 +36,11 @@ struct Time {
uint32_t hours;
uint32_t minutes;
uint32_t seconds;
uint32_t frames; ///< SMPTE frames (not audio samples)
uint32_t frames; ///< Timecode frames (not audio samples)
uint32_t subframes; ///< Typically unused
float rate; ///< Frame rate of this Time
static float default_rate;///< Rate to use for default constructor
bool drop; ///< Whether this Time uses dropframe SMPTE
bool drop; ///< Whether this Time uses dropframe Timecode
Time(float a_rate = default_rate) {
negative = false;
@@ -53,18 +53,18 @@ struct Time {
}
};
Wrap increment( Time& smpte, uint32_t );
Wrap decrement( Time& smpte, uint32_t );
Wrap increment_subframes( Time& smpte, uint32_t );
Wrap decrement_subframes( Time& smpte, uint32_t );
Wrap increment_seconds( Time& smpte, uint32_t );
Wrap increment_minutes( Time& smpte, uint32_t );
Wrap increment_hours( Time& smpte, uint32_t );
void frames_floor( Time& smpte );
void seconds_floor( Time& smpte );
void minutes_floor( Time& smpte );
void hours_floor( Time& smpte );
Wrap increment( Time& timecode, uint32_t );
Wrap decrement( Time& timecode, uint32_t );
Wrap increment_subframes( Time& timecode, uint32_t );
Wrap decrement_subframes( Time& timecode, uint32_t );
Wrap increment_seconds( Time& timecode, uint32_t );
Wrap increment_minutes( Time& timecode, uint32_t );
Wrap increment_hours( Time& timecode, uint32_t );
void frames_floor( Time& timecode );
void seconds_floor( Time& timecode );
void minutes_floor( Time& timecode );
void hours_floor( Time& timecode );
} // namespace SMPTE
} // namespace Timecode
#endif // __ardour_smpte_h__
#endif // __ardour_timecode_h__