X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbroadcast_info.h;h=522d7e7361e2acadae8131327e21f22a8326885c;hb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;hp=07522839fabf1fae7c91be786bc2e465cd65d295;hpb=f2b007195cd75b195e38a4cd7757debac73e7792;p=ardour.git

diff --git a/libs/ardour/ardour/broadcast_info.h b/libs/ardour/ardour/broadcast_info.h
index 07522839fa..522d7e7361 100644
--- a/libs/ardour/ardour/broadcast_info.h
+++ b/libs/ardour/ardour/broadcast_info.h
@@ -26,9 +26,7 @@
 
 #include <sndfile.h>
 
-#include <ardour/types.h>
-
-using std::string;
+#include "ardour/types.h"
 
 namespace ARDOUR
 {
@@ -42,38 +40,38 @@ class BroadcastInfo
 	/// Construct empty broadcast info
 	BroadcastInfo ();
 	~BroadcastInfo ();
-	
+
 	/// Returns last error sring from libsndfile
-	string get_error () const { return error; }
-	
+	std::string get_error () const { return error; }
+
 	/* Convenience functions */
-	
-	void set_from_session (Session const & session, int64_t time);
-	
+
+	void set_from_session (Session const & session, int64_t time_ref);
+
 	/* Reading */
-	
-	bool load_from_file (string const & filename);
+
+	bool load_from_file (std::string const & filename);
 	bool load_from_file (SNDFILE* sf);
-	
-	string get_description () const;
+
+	std::string get_description () const;
 	int64_t get_time_reference () const;
 	struct tm get_origination_time () const;
-	string get_originator () const;
-	string get_originator_ref () const;
-	
+	std::string get_originator () const;
+	std::string get_originator_ref () const;
+
 	/* Writing */
-	
-	bool write_to_file (string const & filename);
+
+	bool write_to_file (std::string const & filename);
 	bool write_to_file (SNDFILE* sf);
-	
-	void set_description (string const & desc);
+
+	void set_description (std::string const & desc);
 	void set_time_reference (int64_t when);
 	void set_origination_time (struct tm * now = 0); // if 0, use time generated at construction
-	void set_originator (string const & str = "");
-	void set_originator_ref (string const & str = "");
-	
+	void set_originator (std::string const & str = "");
+	void set_originator_ref (Session const &, std::string const & str = "");
+
 	/* State info */
-	
+
 	/// Returns true if a info has been succesfully loaded or anything has been manually set
 	bool has_info () const { return _has_info; }
 
@@ -81,10 +79,10 @@ class BroadcastInfo
 
 	SF_BROADCAST_INFO * info;
 	struct tm _time;
-	
+
 	void update_error ();
-	string error;
-	
+	std::string error;
+
 	bool _has_info;
 };