Merge master.

[dcpomatic.git] / src / wx / audio_mapping_view.h

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 76e20ad9a2aef424783bdc7c9e5d7f15c770638d..e0709c8b7abc7d1b72418f403a92238e56ec7834 100644 (file)
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -29,7 +27,7 @@ class AudioMappingView : public wxPanel
 public:
        AudioMappingView (wxWindow *);
 
-       void set_mapping (AudioMapping);
+       void set (AudioMapping);
 
        boost::signals2::signal<void (AudioMapping)> Changed;