Merge master.

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index 579b1c231bf144874af2aa6fcc78b239e419dbe3..8e65bbb5415cc236e496e56a83b92dbd45503082 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -49,8 +49,8 @@ extern "C" {
 
 #undef check
 
-/** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 12
+/** The maximum number of audio channels that we can have in a DCP */
+#define MAX_DCP_AUDIO_CHANNELS 12
 
 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
 
@@ -141,16 +141,20 @@ private:
        char* _old;
 };
 
+/** @class ScopedTemporary
+ *  @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope.
+ */
 class ScopedTemporary
 {
 public:
        ScopedTemporary ();
        ~ScopedTemporary ();
 
+       /** @return temporary filename */
        boost::filesystem::path file () const {
                return _file;
        }
-       
+
        char const * c_str () const;
        FILE* open (char const *);
        void close ();