Merge branch 'windows+cc' into cairocanvas

diff --combined libs/audiographer/audiographer/debuggable.h
index 6fda36c735e7a19416350bc47a977df8fa9eef31,8fe48159de60a2a7eb5ef0d1e8c6c1a3215a3c2b..1cc1d6f7252440cdf1bf5c53c910211692c21358
--- 1/libs/audiographer/audiographer/debuggable.h
--- 2/libs/audiographer/audiographer/debuggable.h
+++ b/libs/audiographer/audiographer/debuggable.h
@@@ -38,19 -38,19 +38,19 @@@ enum LIBAUDIOGRAPHER_API DebugLeve
    * logical and (short-circuiting).
    */
  template<DebugLevel L = DEFAULT_DEBUG_LEVEL>
- class LIBAUDIOGRAPHER_API Debuggable
+ class /*LIBAUDIOGRAPHER_API*/ Debuggable
  {
    protected:
        Debuggable(std::ostream & debug_stream = std::cerr)
                : stream (debug_stream) {}
  
        bool debug_level (DebugLevel level) {
 -              #ifdef NDEBUG
 -              level = DEFAULT_DEBUG_LEVEL; /* stop pedantic gcc complaints about unused parameter */
 +#ifndef NDEBUG
 +              (void) level; /* stop pedantic gcc complaints about unused parameter */
                return false;
 -              #else
 +#else
                return L >= level;
 -              #endif
 +#endif
        }
        std::ostream & debug_stream() { return stream; }
  

diff --combined libs/audiographer/audiographer/general/silence_trimmer.h
index 4cb9f9a5d97f25ac7f51cbd4a8d80a366c94b333,165b29d4d5e5c1fa1ad73af60faab91ebd0e0aee..c0d6d73c4b21bc03cc36ee32478fb5c895a5a7fe
--- 1/libs/audiographer/audiographer/general/silence_trimmer.h
--- 2/libs/audiographer/audiographer/general/silence_trimmer.h
+++ b/libs/audiographer/audiographer/general/silence_trimmer.h
@@@ -14,7 -14,7 +14,7 @@@ namespace AudioGrapher 
  
  /// Removes and adds silent frames to beginning and/or end of stream
  template<typename T = DefaultSampleType>
- class LIBAUDIOGRAPHER_API SilenceTrimmer
+ class /*LIBAUDIOGRAPHER_API*/ SilenceTrimmer
    : public ListedSource<T>
    , public Sink<T>
    , public FlagDebuggable<>
@@@ -131,9 -131,6 +131,9 @@@
                        throw Exception(*this, "process() after reacing end of input");
                }
                in_end = c.has_flag (ProcessContext<T>::EndOfInput);
 +
 +              // If adding to end, delay end of input propagation
 +              if (add_to_end) { c.remove_flag(ProcessContext<T>::EndOfInput); }
                
                framecnt_t frame_index = 0;
                
@@@ -212,8 -209,7 +212,8 @@@
                
                // Finally, if in end, add silence to end
                if (in_end && add_to_end) {
 -                      
 +                      c.set_flag (ProcessContext<T>::EndOfInput);
 +
                        if (debug_level (DebugVerbose)) {
                                debug_stream () << DebugUtils::demangled_name (*this) <<
                                        " adding to end" << std::endl;