smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

fixup mistakes from a manual conflict resolution during rebase on master

Browse source
This commit is contained in:
Paul Davis 2021-02-09 18:30:17 -07:00
parent 4a43f5aa0b
commit 38b1f5eee1
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/session.cc
View file

@ -1,4 +1,4 @@
s/* /*
* Copyright (C) 1999-2019 Paul Davis <paul@linuxaudiosystems.com> * Copyright (C) 1999-2019 Paul Davis <paul@linuxaudiosystems.com>
* Copyright (C) 2006-2007 Jesse Chappell <jesse@essej.net> * Copyright (C) 2006-2007 Jesse Chappell <jesse@essej.net>
* Copyright (C) 2006-2009 Sampo Savolainen <v2@iki.fi> * Copyright (C) 2006-2009 Sampo Savolainen <v2@iki.fi>
@ -181,7 +181,6 @@ Session::Session (AudioEngine &eng,
: _playlists (new SessionPlaylists) : _playlists (new SessionPlaylists)
, _engine (eng) , _engine (eng)
, process_function (&Session::process_with_events) , process_function (&Session::process_with_events)
#if 1
, _bounce_processing_active (false) , _bounce_processing_active (false)
, waiting_for_sync_offset (false) , waiting_for_sync_offset (false)
, _base_sample_rate (0) , _base_sample_rate (0)
@ -477,7 +476,6 @@ Session::Session (AudioEngine &eng,
_global_locate_pending = false; _global_locate_pending = false;
_had_destructive_tracks = false; _had_destructive_tracks = false;
#endif #endif
>>>>>>> libardour: conversion to use timeline types (mega-commit)
created_with = string_compose ("%1 %2", PROGRAM_NAME, revision); created_with = string_compose ("%1 %2", PROGRAM_NAME, revision);