mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-21 14:16:31 +01:00
NO-OP: whitespace
This commit is contained in:
Robin Gareus
parent
e1c4fe8edc
commit
f913d5b9f6
1 changed files with 175 additions and 183 deletions
|
|
@ -629,8 +629,8 @@ Session::create (const string& session_template, BusProfile* bus_profile)
|
|||
if (Profile->get_trx()) {
|
||||
|
||||
/* set initial start + end point : ARDOUR::Session::session_end_shift long.
|
||||
Remember that this is a brand new session. Sessions
|
||||
loaded from saved state will get this range from the saved state.
|
||||
* Remember that this is a brand new session. Sessions
|
||||
* loaded from saved state will get this range from the saved state.
|
||||
*/
|
||||
|
||||
set_session_range_location (0, 0);
|
||||
|
|
@ -799,8 +799,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
|
|||
_save_queued = false;
|
||||
|
||||
if (!_engine.connected ()) {
|
||||
error << string_compose (_("the %1 audio engine is not connected and state saving would lose all I/O connections. Session not saved"),
|
||||
PROGRAM_NAME)
|
||||
error << string_compose (_("the %1 audio engine is not connected and state saving would lose all I/O connections. Session not saved"), PROGRAM_NAME)
|
||||
<< endmsg;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -1275,8 +1274,6 @@ Session::state (bool full_state)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (full_state) {
|
||||
|
||||
if (_locations) {
|
||||
|
|
@ -1455,8 +1452,8 @@ Session::set_state (const XMLNode& node, int version)
|
|||
ID::init_counter (counter);
|
||||
} else {
|
||||
/* old sessions used a timebased counter, so fake
|
||||
the startup ID counter based on a standard
|
||||
timestamp.
|
||||
* the startup ID counter based on a standard
|
||||
* timestamp.
|
||||
*/
|
||||
time_t now;
|
||||
time (&now);
|
||||
|
|
@ -1564,8 +1561,8 @@ Session::set_state (const XMLNode& node, int version)
|
|||
//goto out;
|
||||
} else {
|
||||
/* We can't load Bundles yet as they need to be able
|
||||
to convert from port names to Port objects, which can't happen until
|
||||
later */
|
||||
* to convert from port names to Port objects, which can't happen until
|
||||
* later */
|
||||
_bundle_xml_node = new XMLNode (*child);
|
||||
}
|
||||
}
|
||||
|
|
@ -1659,7 +1656,7 @@ Session::set_state (const XMLNode& node, int version)
|
|||
state_tree = 0;
|
||||
return 0;
|
||||
|
||||
out:
|
||||
out:
|
||||
delete state_tree;
|
||||
state_tree = 0;
|
||||
return ret;
|
||||
|
|
@ -2926,9 +2923,9 @@ accept_all_midi_files (const string& path, void* /*arg*/)
|
|||
return false;
|
||||
}
|
||||
|
||||
return ((path.length() > 4 && path.find (".mid") != (path.length() - 4)) ||
|
||||
(path.length() > 4 && path.find (".smf") != (path.length() - 4)) ||
|
||||
(path.length() > 5 && path.find (".midi") != (path.length() - 5)));
|
||||
return ( (path.length() > 4 && path.find (".mid") != (path.length() - 4))
|
||||
|| (path.length() > 4 && path.find (".smf") != (path.length() - 4))
|
||||
|| (path.length() > 5 && path.find (".midi") != (path.length() - 5)));
|
||||
}
|
||||
|
||||
static bool
|
||||
|
|
@ -3206,8 +3203,7 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
goto out;
|
||||
}
|
||||
|
||||
/* sync the "all regions" property of each playlist with its current state
|
||||
*/
|
||||
/* sync the "all regions" property of each playlist with its current state */
|
||||
|
||||
playlists->sync_all_regions_with_regions ();
|
||||
|
||||
|
|
@ -3224,7 +3220,7 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
++tmp;
|
||||
|
||||
/* do not bother with files that are zero size, otherwise we remove the current "nascent"
|
||||
capture files.
|
||||
* capture files.
|
||||
*/
|
||||
|
||||
if (!i->second->used() && (i->second->length(i->second->timeline_position()) > 0)) {
|
||||
|
|
@ -3307,11 +3303,9 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
cerr << "Source from source list found in used_by_this_snapshot (" << fs->path() << ")\n";
|
||||
} else {
|
||||
cerr << "Source from source list NOT found in used_by_this_snapshot (" << fs->path() << ")\n";
|
||||
/* this source is NOT in use by this snapshot
|
||||
*/
|
||||
/* this source is NOT in use by this snapshot */
|
||||
|
||||
/* remove all related regions from RegionFactory master list
|
||||
*/
|
||||
/* remove all related regions from RegionFactory master list */
|
||||
|
||||
RegionFactory::remove_regions_using_source (i->second);
|
||||
|
||||
|
|
@ -3331,7 +3325,7 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
}
|
||||
|
||||
/* now check each candidate source to see if it exists in the list of
|
||||
sources_used_by_all_snapshots. If it doesn't, put it into "unused".
|
||||
* sources_used_by_all_snapshots. If it doesn't, put it into "unused".
|
||||
*/
|
||||
|
||||
cerr << "Candidates: " << candidates.size() << endl;
|
||||
|
|
@ -3376,8 +3370,8 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
string newpath;
|
||||
|
||||
/* don't move the file across filesystems, just
|
||||
stick it in the `dead_dir_name' directory
|
||||
on whichever filesystem it was already on.
|
||||
* stick it in the `dead_dir_name' directory
|
||||
* on whichever filesystem it was already on.
|
||||
*/
|
||||
|
||||
if ((*x).find ("/sounds/") != string::npos) {
|
||||
|
|
@ -3438,13 +3432,12 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
continue;
|
||||
}
|
||||
|
||||
/* see if there an easy to find peakfile for this file, and remove it.
|
||||
*/
|
||||
/* see if there an easy to find peakfile for this file, and remove it. */
|
||||
|
||||
string base = Glib::path_get_basename (*x);
|
||||
base += "%A"; /* this is what we add for the channel suffix of all native files,
|
||||
or for the first channel of embedded files. it will miss
|
||||
some peakfiles for other channels
|
||||
* or for the first channel of embedded files. it will miss
|
||||
* some peakfiles for other channels
|
||||
*/
|
||||
string peakpath = construct_peak_filepath (base);
|
||||
|
||||
|
|
@ -3467,13 +3460,13 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
_history.clear ();
|
||||
|
||||
/* save state so we don't end up a session file
|
||||
referring to non-existent sources.
|
||||
* referring to non-existent sources.
|
||||
*/
|
||||
|
||||
save_state ("");
|
||||
ret = 0;
|
||||
|
||||
out:
|
||||
out:
|
||||
_state_of_the_state = (StateOfTheState) (_state_of_the_state & ~InCleanup);
|
||||
|
||||
return ret;
|
||||
|
|
@ -4188,14 +4181,13 @@ boost::shared_ptr<Controllable>
|
|||
Session::solo_cut_control() const
|
||||
{
|
||||
/* the solo cut control is a bit of an anomaly, at least as of Febrary 2011. There are no other
|
||||
controls in Ardour that currently get presented to the user in the GUI that require
|
||||
access as a Controllable and are also NOT owned by some SessionObject (e.g. Route, or MonitorProcessor).
|
||||
|
||||
its actually an RCConfiguration parameter, so we use a ProxyControllable to wrap
|
||||
it up as a Controllable. Changes to the Controllable will just map back to the RCConfiguration
|
||||
parameter.
|
||||
* controls in Ardour that currently get presented to the user in the GUI that require
|
||||
* access as a Controllable and are also NOT owned by some SessionObject (e.g. Route, or MonitorProcessor).
|
||||
*
|
||||
* its actually an RCConfiguration parameter, so we use a ProxyControllable to wrap
|
||||
* it up as a Controllable. Changes to the Controllable will just map back to the RCConfiguration
|
||||
* parameter.
|
||||
*/
|
||||
|
||||
return _solo_cut_control;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue