[vlc-commits] macosx/Open: merge the QTCapture and QTSound views

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug 23 11:12:09 2012 +0200| [97feb8c7edea24b9920b673885a90113ba76e94c] | committer: Felix Paul Kühne

macosx/Open: merge the QTCapture and QTSound views

This also allows to set QTSound as an input slave for QTCapture to capture both ES at the same time. (close #6851)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=97feb8c7edea24b9920b673885a90113ba76e94c
---

 NEWS                                               |    1 +
 .../macosx/Resources/English.lproj/Open.xib        |  742 ++++++++++----------
 modules/gui/macosx/open.h                          |   11 +-
 modules/gui/macosx/open.m                          |   80 ++-
 4 files changed, 441 insertions(+), 393 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=97feb8c7edea24b9920b673885a90113ba76e94c