X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.h;h=873d5f7a1674238b7946a3a0bef1434da54d3841;hb=dd7c63112eda87f2e491261873075acff114396b;hp=2c44f32ceeebe507e17e9bd8a8c0d5df3f1b876e;hpb=aeb835a18c8df347e0ed68fb24631b320abeb611;p=dcpomatic.git diff --git a/src/lib/log.h b/src/lib/log.h index 2c44f32ce..873d5f7a1 100644 --- a/src/lib/log.h +++ b/src/lib/log.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -45,11 +46,17 @@ public: void dcp_log (dcp::NoteType type, std::string message); void set_types (int types); + int types () const { + return _types; + } /** @param amount Approximate number of bytes to return; the returned value * may be shorter or longer than this. */ - virtual std::string head_and_tail (int amount = 1024) const = 0; + virtual std::string head_and_tail (int amount = 1024) const { + (void) amount; + return ""; + } protected: @@ -58,11 +65,9 @@ protected: private: virtual void do_log (boost::shared_ptr entry) = 0; - void config_changed (); /** bit-field of log types which should be put into the log (others are ignored) */ int _types; - boost::signals2::scoped_connection _config_connection; }; #endif