X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=e8b31b7f478ef816256d901f69252243c88a3a3f;hb=c8be0644833dce6ff39202430bba0ab358f3e096;hp=f4e2dbae283f9efa5fa6361e6fcf32548925a362;hpb=775ae0e37bbec115d742feade0adc614a9a2301c;p=dcpomatic.git diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index f4e2dbae2..e8b31b7f4 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 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 . */ @@ -31,6 +32,7 @@ class wxListEvent; class TimelineDialog; class FilmEditor; class ContentSubPanel; +class AudioPanel; class Film; class FilmViewer; @@ -46,6 +48,7 @@ public: void set_film (boost::shared_ptr); void set_general_sensitivity (bool s); void set_selection (boost::weak_ptr); + void set_selection (ContentList cl); void film_changed (Film::Property p); void film_content_changed (int p); @@ -60,7 +63,7 @@ public: ContentList selected (); ContentList selected_video (); - AudioContentList selected_audio (); + ContentList selected_audio (); ContentList selected_subtitle (); FFmpegContentList selected_ffmpeg (); @@ -92,7 +95,7 @@ private: wxButton* _later; wxButton* _timeline; ContentSubPanel* _video_panel; - ContentSubPanel* _audio_panel; + AudioPanel* _audio_panel; ContentSubPanel* _subtitle_panel; ContentSubPanel* _timing_panel; std::list _panels;