diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-03-24 23:30:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-03-24 23:30:08 +0000 |
| commit | 86aaba4f392c35ccf28221049f87b8cdba868777 (patch) | |
| tree | 9809348c4b13f1f8a0d1f3701f829cda50b98db5 /src/wx/content_panel.cc | |
| parent | 11d68f1cda11ecf5983451c10a73a37692b025bb (diff) | |
Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;
allow "deletion" of the audio part of a FFmpeg file from the
timeline; delete unmaps the audio (#316).
Diffstat (limited to 'src/wx/content_panel.cc')
| -rw-r--r-- | src/wx/content_panel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 8bcf46f5c..30c03538b 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -335,7 +335,7 @@ ContentPanel::timeline_clicked () void ContentPanel::right_click (wxListEvent& ev) { - _menu->popup (_film, selected (), ev.GetPoint ()); + _menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ()); } /** Set up broad sensitivity based on the type of content that is selected */ |