diff --git a/NEWS b/NEWS index 1cc4a618c6..e8b549bbb8 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,7 @@ Access: * RTP: support for dynamic payload types by specifying the payload format in an option (no autodetection): only Theora supported for now * Basic HTCPCP implementation for Coffee Pot control + * QTCapture: added support for all QTKit-compatible video input devices Codecs: * You can now use ffmpeg-mt in conjunction with vlc diff --git a/configure.ac b/configure.ac index 6c88193cd2..c851043bb7 100644 --- a/configure.ac +++ b/configure.ac @@ -3779,6 +3779,7 @@ then VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib index b06ddf575f..bdf2baabe8 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib @@ -2,20 +2,19 @@ 1050 - 11A430e + 11A444d 851 - 1117 - 552.00 + 1119.1 + 555.00 com.apple.InterfaceBuilder.CocoaPlugin 851 YES + - - - + YES @@ -70,10 +69,10 @@ 67239424 0 Stream output: - + LucidaGrande 13 - 1040 + 16 1211912703 @@ -97,7 +96,11 @@ 67239424 137887744 Open - + + LucidaGrande + 13 + 1040 + -2038284033 1 @@ -145,7 +148,7 @@ 1 - + 256 YES @@ -352,7 +355,6 @@ {{10, 33}, {528, 232}} - File @@ -836,7 +838,7 @@ - + 256 YES @@ -853,29 +855,25 @@ 109199615 1 - - LucidaGrande - 13 - 16 - + 400 75 - + - EyeTV + Screen 1048576 2147483647 1 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState @@ -889,31 +887,32 @@ YES - - + - Screen + EyeTV 1048576 2147483647 - - + + _popUpItemAction: + iSight Capture 1048576 2147483647 - - + + _popUpItemAction: + 1 3 YES YES @@ -922,20 +921,21 @@ {{10, 33}, {528, 232}} + Capture - + 0 YES YES YES - + @@ -964,14 +964,18 @@ 264 - {{38, 85}, {246, 14}} + {{38, 82}, {246, 17}} YES 67239424 272629760 Media Resource Locator (MRL) - + + LucidaGrande + 11 + 16 + @@ -1012,6 +1016,7 @@ {213, 129} {1.7976931348623157e+308, 1.7976931348623157e+308} open + YES 3 @@ -1322,8 +1327,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1341,8 +1346,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1383,8 +1388,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1402,8 +1407,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1413,8 +1418,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1455,8 +1460,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1474,8 +1479,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1485,8 +1490,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1546,6 +1551,7 @@ c3ViX2FsaWduX2xibDsKCg {213, 129} {1.7976931348623157e+308, 1.7976931348623157e+308} subs + YES VLCOutput @@ -1814,8 +1820,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1833,8 +1839,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1844,8 +1850,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1855,8 +1861,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1960,8 +1966,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1979,8 +1985,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -1990,8 +1996,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -2001,8 +2007,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -2012,8 +2018,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -2023,8 +2029,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -2034,8 +2040,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -2045,8 +2051,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 - - + + _popUpItemAction: @@ -2203,8 +2209,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2304,8 +2310,8 @@ c3ViX2FsaWduX2xibDsKCg 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2884,15 +2890,16 @@ c3ViX2FsaWduX2xibDsKCg NO - {{1, 1}, {524, 540}} + {524, 540} {{0, 0}, {1280, 778}} {213, 129} {1.7976931348623157e+308, 1.7976931348623157e+308} sout + YES - + 256 YES @@ -2981,12 +2988,11 @@ ZCBWTEMncyBFeWVUViBwbHVnaW4uA {528, 222} - NSView NSResponder - + 256 YES @@ -3026,7 +3032,6 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA {528, 222} - NSView @@ -3126,8 +3131,8 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3145,8 +3150,8 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 1048576 2147483647 - - + + _popUpItemAction: @@ -3156,8 +3161,8 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 1048576 2147483647 - - + + _popUpItemAction: @@ -3615,11 +3620,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 67239424 0 Title - - LucidaGrande - 11 - 16 - + 3 @@ -3637,6 +3638,150 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA NSView NSResponder + + + 256 + + YES + + + 256 + {{17, 185}, {494, 17}} + + YES + + 67239424 + 138412032 + Screen Capture Input + + + + + + + + + 256 + {{17, 153}, {494, 14}} + + YES + + 67239424 + 138412032 + This facility allows you to process your screen's output. + + + + + + + + + 256 + + YES + + + 274 + + YES + + + 268 + {{120, 47}, {286, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 129 + + + 400 + 75 + + + Item 1 + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + Item 2 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Item 3 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + + 1 + YES + YES + 2 + + + + {{2, 2}, {490, 119}} + + + + {{17, 16}, {494, 123}} + + {0, 0} + + 67239424 + 0 + Title + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 0 + NO + + + {528, 222} + + NSView + NSResponder + 3 2 @@ -4263,6 +4408,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA {{0, 0}, {1280, 778}} {213, 129} {1.7976931348623157e+308, 1.7976931348623157e+308} + YES @@ -6259,13 +6405,53 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 3012 + + + o_qtk_view + + + + 3068 + + + + o_qtk_lbl + + + + 3069 + + + + o_qtk_long_lbl + + + + 3070 + + + + o_qtk_device_pop + + + + 3077 + + + + qtkChanged: + + + + 3078 + o_mrl_fld - 3013 + 3079 @@ -8890,6 +9076,99 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA + + 3013 + + + YES + + + + + + QTKit + + + 3014 + + + YES + + + + + + 3015 + + + YES + + + + + + 3016 + + + YES + + + + + + 3017 + + + + + 3018 + + + + + 3071 + + + YES + + + + + + 3072 + + + YES + + + + + + 3073 + + + YES + + + + + + + + 3074 + + + + + 3075 + + + + + 3076 + + + @@ -8902,7 +9181,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 1112.ImportedFromIB2 1256.IBPluginDependency 1256.ImportedFromIB2 + 1263.IBEditorWindowLastContentRect 1263.IBPluginDependency + 1263.IBWindowTemplateEditedContentRect 1263.ImportedFromIB2 1263.windowTemplate.hasMinSize 1263.windowTemplate.minSize @@ -8983,7 +9264,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 1406.ImportedFromIB2 1409.IBPluginDependency 1409.ImportedFromIB2 + 1411.IBEditorWindowLastContentRect 1411.IBPluginDependency + 1411.IBWindowTemplateEditedContentRect 1411.ImportedFromIB2 1411.windowTemplate.hasMinSize 1411.windowTemplate.minSize @@ -9122,9 +9405,11 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2301.IBPluginDependency 2301.ImportedFromIB2 2302.IBPluginDependency + 2302.IBViewBoundsToFrameTransform 2302.ImportedFromIB2 2303.IBPluginDependency 2303.ImportedFromIB2 + 2304.IBEditorWindowLastContentRect 2304.IBPluginDependency 2304.ImportedFromIB2 2305.IBPluginDependency @@ -9149,6 +9434,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2314.ImportedFromIB2 2327.IBPluginDependency 2327.ImportedFromIB2 + 2328.IBEditorWindowLastContentRect 2328.IBPluginDependency 2328.ImportedFromIB2 2329.IBPluginDependency @@ -9159,6 +9445,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2331.ImportedFromIB2 2346.IBEditorWindowLastContentRect 2346.IBPluginDependency + 2346.IBViewBoundsToFrameTransform 2346.ImportedFromIB2 2347.IBPluginDependency 2347.ImportedFromIB2 @@ -9406,6 +9693,25 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 3005.IBPluginDependency 3008.IBPluginDependency 3009.IBPluginDependency + 3013.IBEditorWindowLastContentRect + 3013.IBPluginDependency + 3013.ImportedFromIB2 + 3014.IBPluginDependency + 3014.ImportedFromIB2 + 3015.IBPluginDependency + 3015.ImportedFromIB2 + 3016.IBPluginDependency + 3016.ImportedFromIB2 + 3017.IBPluginDependency + 3018.IBPluginDependency + 3071.IBPluginDependency + 3071.IBViewBoundsToFrameTransform + 3072.IBPluginDependency + 3073.IBEditorWindowLastContentRect + 3073.IBPluginDependency + 3074.IBPluginDependency + 3075.IBPluginDependency + 3076.IBPluginDependency 408.ImportedFromIB2 636.IBEditorWindowLastContentRect 636.IBPluginDependency @@ -9479,7 +9785,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin + {{21, 395}, {528, 305}} com.apple.InterfaceBuilder.CocoaPlugin + {{21, 395}, {528, 305}} {213, 107} @@ -9560,7 +9868,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin + {{42, 137}, {524, 540}} com.apple.InterfaceBuilder.CocoaPlugin + {{42, 137}, {524, 540}} {213, 107} @@ -9686,7 +9996,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin - {{343, 328}, {528, 222}} + {{116, 383}, {528, 222}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -9695,13 +10005,17 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin - {{343, 523}, {528, 222}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - + {{152, 100}, {528, 222}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw0gAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + {{0, 501}, {527, 222}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -9726,6 +10040,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin + {{647, 423}, {163, 63}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -9736,6 +10051,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA {{343, 282}, {528, 222}} com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -9983,10 +10299,31 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - {{355, 317}, {574, 380}} + {{453, 534}, {528, 222}} com.apple.InterfaceBuilder.CocoaPlugin - {{355, 317}, {574, 380}} + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABC4gAAwpAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + {{581, 644}, {286, 63}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + {{451, 153}, {574, 380}} + com.apple.InterfaceBuilder.CocoaPlugin + {{451, 153}, {574, 380}} {213, 107} @@ -10065,7 +10402,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - 3013 + 3079 @@ -10078,13 +10415,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - NSApplication - - IBProjectSource - ../../../modules/gui/macosx/applescript.h - - NSApplication NSResponder @@ -10093,13 +10423,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - NSObject - - IBProjectSource - ../../../modules/gui/macosx/AppleRemote.h - - NSObject @@ -10107,974 +10430,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - VLCOpen - NSObject - - YES - - YES - expandMRLfieldAction: - eyetvGetPlugin: - eyetvLaunch: - eyetvSwitchChannel: - inputSlaveAction: - openCaptureModeChanged: - openDiscMenusChanged: - openDiscStepperChanged: - openDiscTypeChanged: - openFileBrowse: - openFileStreamChanged: - openNetModeChanged: - openNetStepperChanged: - openNetUDPButtonAction: - openVTSBrowse: - panelCancel: - panelOk: - screenStepperChanged: - subCloseSheet: - subDelayStepperChanged: - subFileBrowse: - subFpsStepperChanged: - subOverride: - subSettings: - subsChanged: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - expandMRLfieldAction: - eyetvGetPlugin: - eyetvLaunch: - eyetvSwitchChannel: - inputSlaveAction: - openCaptureModeChanged: - openDiscMenusChanged: - openDiscStepperChanged: - openDiscTypeChanged: - openFileBrowse: - openFileStreamChanged: - openNetModeChanged: - openNetStepperChanged: - openNetUDPButtonAction: - openVTSBrowse: - panelCancel: - panelOk: - screenStepperChanged: - subCloseSheet: - subDelayStepperChanged: - subFileBrowse: - subFpsStepperChanged: - subOverride: - subSettings: - subsChanged: - - - YES - - expandMRLfieldAction: - id - - - eyetvGetPlugin: - id - - - eyetvLaunch: - id - - - eyetvSwitchChannel: - id - - - inputSlaveAction: - id - - - openCaptureModeChanged: - id - - - openDiscMenusChanged: - id - - - openDiscStepperChanged: - id - - - openDiscTypeChanged: - id - - - openFileBrowse: - id - - - openFileStreamChanged: - id - - - openNetModeChanged: - id - - - openNetStepperChanged: - id - - - openNetUDPButtonAction: - id - - - openVTSBrowse: - id - - - panelCancel: - id - - - panelOk: - id - - - screenStepperChanged: - id - - - subCloseSheet: - id - - - subDelayStepperChanged: - id - - - subFileBrowse: - id - - - subFpsStepperChanged: - id - - - subOverride: - id - - - subSettings: - id - - - subsChanged: - id - - - - - YES - - YES - o_btn_cancel - o_btn_ok - o_capture_label_view - o_capture_lbl - o_capture_long_lbl - o_capture_mode_pop - o_currentCaptureView - o_disc_chapter - o_disc_chapter_lbl - o_disc_chapter_stp - o_disc_device - o_disc_device_lbl - o_disc_dvd_menus - o_disc_title - o_disc_title_lbl - o_disc_title_stp - o_disc_type - o_disc_videots_btn_browse - o_disc_videots_folder - o_eyetv_channels_pop - o_eyetv_chn_bgbar - o_eyetv_chn_status_txt - o_eyetv_currentChannel_lbl - o_eyetv_getPlugin_btn - o_eyetv_launchEyeTV_btn - o_eyetv_nextProgram_btn - o_eyetv_noInstanceLong_lbl - o_eyetv_noInstance_lbl - o_eyetv_notLaunched_view - o_eyetv_previousProgram_btn - o_eyetv_running_view - o_file_btn_browse - o_file_path - o_file_slave_ckbox - o_file_slave_filename_txt - o_file_slave_select_btn - o_file_stream - o_file_sub_align_lbl - o_file_sub_align_pop - o_file_sub_btn_browse - o_file_sub_btn_settings - o_file_sub_ckbox - o_file_sub_delay - o_file_sub_delay_lbl - o_file_sub_delay_stp - o_file_sub_encoding_lbl - o_file_sub_encoding_pop - o_file_sub_file_box - o_file_sub_font_box - o_file_sub_fps - o_file_sub_fps_lbl - o_file_sub_fps_stp - o_file_sub_ok_btn - o_file_sub_override - o_file_sub_path - o_file_sub_sheet - o_file_sub_size_lbl - o_file_sub_size_pop - o_mrl - o_mrl_btn - o_mrl_lbl - o_mrl_view - o_net_help_lbl - o_net_help_udp_lbl - o_net_http_url - o_net_http_url_lbl - o_net_mode - o_net_openUDP_btn - o_net_udp_address_lbl - o_net_udp_cancel_btn - o_net_udp_mode_lbl - o_net_udp_ok_btn - o_net_udp_panel - o_net_udp_port - o_net_udp_port_lbl - o_net_udp_port_stp - o_net_udp_protocol_lbl - o_net_udp_protocol_mat - o_net_udpm_addr - o_net_udpm_addr_lbl - o_net_udpm_port - o_net_udpm_port_lbl - o_net_udpm_port_stp - o_output_ckbox - o_panel - o_playlist - o_screen_follow_mouse_ckb - o_screen_fps_fld - o_screen_fps_lbl - o_screen_fps_stp - o_screen_height_fld - o_screen_height_lbl - o_screen_height_stp - o_screen_lbl - o_screen_left_fld - o_screen_left_lbl - o_screen_left_stp - o_screen_long_lbl - o_screen_top_fld - o_screen_top_lbl - o_screen_top_stp - o_screen_view - o_screen_width_fld - o_screen_width_lbl - o_screen_width_stp - o_sout_options - o_tabview - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - o_btn_cancel - o_btn_ok - o_capture_label_view - o_capture_lbl - o_capture_long_lbl - o_capture_mode_pop - o_currentCaptureView - o_disc_chapter - o_disc_chapter_lbl - o_disc_chapter_stp - o_disc_device - o_disc_device_lbl - o_disc_dvd_menus - o_disc_title - o_disc_title_lbl - o_disc_title_stp - o_disc_type - o_disc_videots_btn_browse - o_disc_videots_folder - o_eyetv_channels_pop - o_eyetv_chn_bgbar - o_eyetv_chn_status_txt - o_eyetv_currentChannel_lbl - o_eyetv_getPlugin_btn - o_eyetv_launchEyeTV_btn - o_eyetv_nextProgram_btn - o_eyetv_noInstanceLong_lbl - o_eyetv_noInstance_lbl - o_eyetv_notLaunched_view - o_eyetv_previousProgram_btn - o_eyetv_running_view - o_file_btn_browse - o_file_path - o_file_slave_ckbox - o_file_slave_filename_txt - o_file_slave_select_btn - o_file_stream - o_file_sub_align_lbl - o_file_sub_align_pop - o_file_sub_btn_browse - o_file_sub_btn_settings - o_file_sub_ckbox - o_file_sub_delay - o_file_sub_delay_lbl - o_file_sub_delay_stp - o_file_sub_encoding_lbl - o_file_sub_encoding_pop - o_file_sub_file_box - o_file_sub_font_box - o_file_sub_fps - o_file_sub_fps_lbl - o_file_sub_fps_stp - o_file_sub_ok_btn - o_file_sub_override - o_file_sub_path - o_file_sub_sheet - o_file_sub_size_lbl - o_file_sub_size_pop - o_mrl - o_mrl_btn - o_mrl_lbl - o_mrl_view - o_net_help_lbl - o_net_help_udp_lbl - o_net_http_url - o_net_http_url_lbl - o_net_mode - o_net_openUDP_btn - o_net_udp_address_lbl - o_net_udp_cancel_btn - o_net_udp_mode_lbl - o_net_udp_ok_btn - o_net_udp_panel - o_net_udp_port - o_net_udp_port_lbl - o_net_udp_port_stp - o_net_udp_protocol_lbl - o_net_udp_protocol_mat - o_net_udpm_addr - o_net_udpm_addr_lbl - o_net_udpm_port - o_net_udpm_port_lbl - o_net_udpm_port_stp - o_output_ckbox - o_panel - o_playlist - o_screen_follow_mouse_ckb - o_screen_fps_fld - o_screen_fps_lbl - o_screen_fps_stp - o_screen_height_fld - o_screen_height_lbl - o_screen_height_stp - o_screen_lbl - o_screen_left_fld - o_screen_left_lbl - o_screen_left_stp - o_screen_long_lbl - o_screen_top_fld - o_screen_top_lbl - o_screen_top_stp - o_screen_view - o_screen_width_fld - o_screen_width_lbl - o_screen_width_stp - o_sout_options - o_tabview - - - YES - - o_btn_cancel - id - - - o_btn_ok - id - - - o_capture_label_view - id - - - o_capture_lbl - id - - - o_capture_long_lbl - id - - - o_capture_mode_pop - id - - - o_currentCaptureView - id - - - o_disc_chapter - id - - - o_disc_chapter_lbl - id - - - o_disc_chapter_stp - id - - - o_disc_device - id - - - o_disc_device_lbl - id - - - o_disc_dvd_menus - id - - - o_disc_title - id - - - o_disc_title_lbl - id - - - o_disc_title_stp - id - - - o_disc_type - id - - - o_disc_videots_btn_browse - id - - - o_disc_videots_folder - id - - - o_eyetv_channels_pop - id - - - o_eyetv_chn_bgbar - id - - - o_eyetv_chn_status_txt - id - - - o_eyetv_currentChannel_lbl - id - - - o_eyetv_getPlugin_btn - id - - - o_eyetv_launchEyeTV_btn - id - - - o_eyetv_nextProgram_btn - id - - - o_eyetv_noInstanceLong_lbl - id - - - o_eyetv_noInstance_lbl - id - - - o_eyetv_notLaunched_view - id - - - o_eyetv_previousProgram_btn - id - - - o_eyetv_running_view - id - - - o_file_btn_browse - id - - - o_file_path - id - - - o_file_slave_ckbox - id - - - o_file_slave_filename_txt - id - - - o_file_slave_select_btn - id - - - o_file_stream - id - - - o_file_sub_align_lbl - id - - - o_file_sub_align_pop - id - - - o_file_sub_btn_browse - id - - - o_file_sub_btn_settings - id - - - o_file_sub_ckbox - id - - - o_file_sub_delay - id - - - o_file_sub_delay_lbl - id - - - o_file_sub_delay_stp - id - - - o_file_sub_encoding_lbl - id - - - o_file_sub_encoding_pop - id - - - o_file_sub_file_box - id - - - o_file_sub_font_box - id - - - o_file_sub_fps - id - - - o_file_sub_fps_lbl - id - - - o_file_sub_fps_stp - id - - - o_file_sub_ok_btn - id - - - o_file_sub_override - id - - - o_file_sub_path - id - - - o_file_sub_sheet - id - - - o_file_sub_size_lbl - id - - - o_file_sub_size_pop - id - - - o_mrl - id - - - o_mrl_btn - id - - - o_mrl_lbl - id - - - o_mrl_view - id - - - o_net_help_lbl - id - - - o_net_help_udp_lbl - id - - - o_net_http_url - id - - - o_net_http_url_lbl - id - - - o_net_mode - id - - - o_net_openUDP_btn - id - - - o_net_udp_address_lbl - id - - - o_net_udp_cancel_btn - id - - - o_net_udp_mode_lbl - id - - - o_net_udp_ok_btn - id - - - o_net_udp_panel - id - - - o_net_udp_port - id - - - o_net_udp_port_lbl - id - - - o_net_udp_port_stp - id - - - o_net_udp_protocol_lbl - id - - - o_net_udp_protocol_mat - id - - - o_net_udpm_addr - id - - - o_net_udpm_addr_lbl - id - - - o_net_udpm_port - id - - - o_net_udpm_port_lbl - id - - - o_net_udpm_port_stp - id - - - o_output_ckbox - id - - - o_panel - id - - - o_playlist - id - - - o_screen_follow_mouse_ckb - id - - - o_screen_fps_fld - id - - - o_screen_fps_lbl - id - - - o_screen_fps_stp - id - - - o_screen_height_fld - id - - - o_screen_height_lbl - id - - - o_screen_height_stp - id - - - o_screen_lbl - id - - - o_screen_left_fld - id - - - o_screen_left_lbl - id - - - o_screen_left_stp - id - - - o_screen_long_lbl - id - - - o_screen_top_fld - id - - - o_screen_top_lbl - id - - - o_screen_top_stp - id - - - o_screen_view - id - - - o_screen_width_fld - id - - - o_screen_width_lbl - id - - - o_screen_width_stp - id - - - o_sout_options - id - - - o_tabview - id - - - - - IBProjectSource - ../../../modules/gui/macosx/open.h - - VLCOpen NSObject @@ -11129,11 +10484,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - VLCOpenTextField - NSTextField - - VLCOpenTextField NSTextField @@ -11142,400 +10492,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - VLCOutput - NSObject - - YES - - YES - announceChanged: - outputChanged: - outputCloseSheet: - outputFileBrowse: - outputSettings: - - - YES - id - id - id - id - id - - - - YES - - YES - announceChanged: - outputChanged: - outputCloseSheet: - outputFileBrowse: - outputSettings: - - - YES - - announceChanged: - id - - - outputChanged: - id - - - outputCloseSheet: - id - - - outputFileBrowse: - id - - - outputSettings: - id - - - - - YES - - YES - o_btn_browse - o_btn_ok - o_channel_name - o_channel_name_lbl - o_display - o_dump_chkbox - o_file_chkbox - o_file_field - o_http_chkbox - o_method - o_misc_lbl - o_mux_lbl - o_mux_selector - o_open_panel - o_options_lbl - o_output_ckbox - o_output_settings - o_output_sheet - o_rtsp_chkbox - o_sap_chkbox - o_sdp_url - o_sdp_url_lbl - o_stream_address - o_stream_address_lbl - o_stream_port - o_stream_port_lbl - o_stream_port_stp - o_stream_ttl - o_stream_ttl_lbl - o_stream_ttl_stp - o_stream_type - o_stream_type_lbl - o_transcode_audio_bitrate - o_transcode_audio_bitrate_lbl - o_transcode_audio_channels - o_transcode_audio_channels_lbl - o_transcode_audio_chkbox - o_transcode_audio_selector - o_transcode_lbl - o_transcode_video_bitrate - o_transcode_video_bitrate_lbl - o_transcode_video_chkbox - o_transcode_video_scale - o_transcode_video_scale_lbl - o_transcode_video_selector - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - o_btn_browse - o_btn_ok - o_channel_name - o_channel_name_lbl - o_display - o_dump_chkbox - o_file_chkbox - o_file_field - o_http_chkbox - o_method - o_misc_lbl - o_mux_lbl - o_mux_selector - o_open_panel - o_options_lbl - o_output_ckbox - o_output_settings - o_output_sheet - o_rtsp_chkbox - o_sap_chkbox - o_sdp_url - o_sdp_url_lbl - o_stream_address - o_stream_address_lbl - o_stream_port - o_stream_port_lbl - o_stream_port_stp - o_stream_ttl - o_stream_ttl_lbl - o_stream_ttl_stp - o_stream_type - o_stream_type_lbl - o_transcode_audio_bitrate - o_transcode_audio_bitrate_lbl - o_transcode_audio_channels - o_transcode_audio_channels_lbl - o_transcode_audio_chkbox - o_transcode_audio_selector - o_transcode_lbl - o_transcode_video_bitrate - o_transcode_video_bitrate_lbl - o_transcode_video_chkbox - o_transcode_video_scale - o_transcode_video_scale_lbl - o_transcode_video_selector - - - YES - - o_btn_browse - id - - - o_btn_ok - id - - - o_channel_name - id - - - o_channel_name_lbl - id - - - o_display - id - - - o_dump_chkbox - id - - - o_file_chkbox - id - - - o_file_field - id - - - o_http_chkbox - id - - - o_method - id - - - o_misc_lbl - id - - - o_mux_lbl - id - - - o_mux_selector - id - - - o_open_panel - id - - - o_options_lbl - id - - - o_output_ckbox - id - - - o_output_settings - id - - - o_output_sheet - id - - - o_rtsp_chkbox - id - - - o_sap_chkbox - id - - - o_sdp_url - id - - - o_sdp_url_lbl - id - - - o_stream_address - id - - - o_stream_address_lbl - id - - - o_stream_port - id - - - o_stream_port_lbl - id - - - o_stream_port_stp - id - - - o_stream_ttl - id - - - o_stream_ttl_lbl - id - - - o_stream_ttl_stp - id - - - o_stream_type - id - - - o_stream_type_lbl - id - - - o_transcode_audio_bitrate - id - - - o_transcode_audio_bitrate_lbl - id - - - o_transcode_audio_channels - id - - - o_transcode_audio_channels_lbl - id - - - o_transcode_audio_chkbox - id - - - o_transcode_audio_selector - id - - - o_transcode_lbl - id - - - o_transcode_video_bitrate - id - - - o_transcode_video_bitrate_lbl - id - - - o_transcode_video_chkbox - id - - - o_transcode_video_scale - id - - - o_transcode_video_scale_lbl - id - - - o_transcode_video_selector - id - - - - - IBProjectSource - ../../../modules/gui/macosx/output.h - - VLCOutput NSObject @@ -11604,365 +10560,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - VLCPlaylist - VLCPlaylistCommon - - YES - - YES - addNode: - deleteItem: - downloadCoverArt: - playItem: - preparseItem: - recursiveExpandNode: - revealItemInFinder: - savePlaylist: - searchItem: - selectAll: - servicesChange: - sortNodeByAuthor: - sortNodeByName: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addNode: - deleteItem: - downloadCoverArt: - playItem: - preparseItem: - recursiveExpandNode: - revealItemInFinder: - savePlaylist: - searchItem: - selectAll: - servicesChange: - sortNodeByAuthor: - sortNodeByName: - - - YES - - addNode: - id - - - deleteItem: - id - - - downloadCoverArt: - id - - - playItem: - id - - - preparseItem: - id - - - recursiveExpandNode: - id - - - revealItemInFinder: - id - - - savePlaylist: - id - - - searchItem: - id - - - selectAll: - id - - - servicesChange: - id - - - sortNodeByAuthor: - id - - - sortNodeByName: - id - - - - - YES - - YES - o_btn_addNode - o_btn_playlist - o_controller - o_ctx_menu - o_mi_addNode - o_mi_delete - o_mi_dl_cover_art - o_mi_info - o_mi_play - o_mi_preparse - o_mi_recursive_expand - o_mi_revealInFinder - o_mi_save_playlist - o_mi_selectall - o_mi_services - o_mi_sort_author - o_mi_sort_name - o_mm_mi_revealInFinder - o_mm_mi_services - o_mm_mu_services - o_mu_services - o_playlist_view - o_playlist_wizard - o_save_accessory_popup - o_save_accessory_text - o_save_accessory_view - o_search_field - o_search_field_other - o_sidebar - o_status_field - o_status_field_embed - o_tc_sortColumn - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - o_btn_addNode - o_btn_playlist - o_controller - o_ctx_menu - o_mi_addNode - o_mi_delete - o_mi_dl_cover_art - o_mi_info - o_mi_play - o_mi_preparse - o_mi_recursive_expand - o_mi_revealInFinder - o_mi_save_playlist - o_mi_selectall - o_mi_services - o_mi_sort_author - o_mi_sort_name - o_mm_mi_revealInFinder - o_mm_mi_services - o_mm_mu_services - o_mu_services - o_playlist_view - o_playlist_wizard - o_save_accessory_popup - o_save_accessory_text - o_save_accessory_view - o_search_field - o_search_field_other - o_sidebar - o_status_field - o_status_field_embed - o_tc_sortColumn - - - YES - - o_btn_addNode - id - - - o_btn_playlist - id - - - o_controller - id - - - o_ctx_menu - id - - - o_mi_addNode - id - - - o_mi_delete - id - - - o_mi_dl_cover_art - id - - - o_mi_info - id - - - o_mi_play - id - - - o_mi_preparse - id - - - o_mi_recursive_expand - id - - - o_mi_revealInFinder - id - - - o_mi_save_playlist - id - - - o_mi_selectall - id - - - o_mi_services - id - - - o_mi_sort_author - id - - - o_mi_sort_name - id - - - o_mm_mi_revealInFinder - id - - - o_mm_mi_services - id - - - o_mm_mu_services - id - - - o_mu_services - id - - - o_playlist_view - id - - - o_playlist_wizard - id - - - o_save_accessory_popup - id - - - o_save_accessory_text - id - - - o_save_accessory_view - id - - - o_search_field - id - - - o_search_field_other - id - - - o_sidebar - id - - - o_status_field - id - - - o_status_field_embed - id - - - o_tc_sortColumn - id - - - - - IBProjectSource - ../../../modules/gui/macosx/playlist.h - - VLCPlaylist VLCPlaylistCommon @@ -11971,85 +10568,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - VLCPlaylistCommon - NSObject - - YES - - YES - o_outline_view - o_outline_view_other - o_tc_author - o_tc_author_other - o_tc_duration - o_tc_duration_other - o_tc_name - o_tc_name_other - - - YES - id - id - id - id - id - id - id - id - - - - YES - - YES - o_outline_view - o_outline_view_other - o_tc_author - o_tc_author_other - o_tc_duration - o_tc_duration_other - o_tc_name - o_tc_name_other - - - YES - - o_outline_view - id - - - o_outline_view_other - id - - - o_tc_author - id - - - o_tc_author_other - id - - - o_tc_duration - id - - - o_tc_duration_other - id - - - o_tc_name - id - - - o_tc_name_other - id - - - - - VLCPlaylistCommon NSObject @@ -13024,7 +11542,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - + IBDocumentRelativeSource ../../../../../modules/gui/macosx/open.h @@ -13032,7 +11550,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA VLCOpenTextField NSTextField - + @@ -13042,6 +11560,10 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin.macosx + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib index 12fd21678a..c6e9d1b244 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m index b2fd2ed292..3c4da2cf36 100644 --- a/modules/access/qtcapture.m +++ b/modules/access/qtcapture.m @@ -1,7 +1,7 @@ /***************************************************************************** * qtcapture.m: qtkit (Mac OS X) based capture module ***************************************************************************** -* Copyright (C) 2008 the VideoLAN team +* Copyright (C) 2008-2011 the VideoLAN team * * Authors: Pierre d'Herbemont * @@ -258,8 +258,8 @@ static int Open( vlc_object_t *p_this ) { camera_format = [format_array objectAtIndex: k]; - NSLog( @"%@", [camera_format localizedFormatSummary] ); - NSLog( @"%@",[[camera_format formatDescriptionAttributes] description] ); + msg_Dbg(p_demux, "localized Format: %s", [[camera_format localizedFormatSummary] UTF8String] ); + msg_Dbg(p_demux, "format description: %s", [[[camera_format formatDescriptionAttributes] description] UTF8String] ); } if( [format_array count] ) camera_format = [format_array objectAtIndex: 0]; @@ -288,9 +288,9 @@ static int Open( vlc_object_t *p_this ) fmt.video.i_sar_den = encoded_size.width; } - NSLog( @"encoded_size %d %d", (int)encoded_size.width, (int)encoded_size.height ); - NSLog( @"display_size %d %d", (int)display_size.width, (int)display_size.height ); - NSLog( @"PAR size %d %d", (int)par_size.width, (int)par_size.height ); + msg_Dbg(p_demux, "encoded_size %i %i", (int)encoded_size.width, (int)encoded_size.height ); + msg_Dbg(p_demux, "display_size %i %i", (int)display_size.width, (int)display_size.height ); + msg_Dbg(p_demux, "PAR size %i %i", (int)par_size.width, (int)par_size.height ); [p_sys->output setPixelBufferAttributes: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: p_sys->height], kCVPixelBufferHeightKey, diff --git a/modules/gui/macosx/TrackSynchronization.m b/modules/gui/macosx/TrackSynchronization.m index 21e0bc18d0..62997f2c9f 100644 --- a/modules/gui/macosx/TrackSynchronization.m +++ b/modules/gui/macosx/TrackSynchronization.m @@ -82,7 +82,6 @@ static VLCTrackSynchronization *_o_sharedInstance = nil; if( p_input ) { - var_SetTime( p_input, "audio-delay", 0.0 ); var_SetTime( p_input, "spu-delay", 0.0 ); var_SetFloat( p_input, "sub-fps", 1.0 ); diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index 8aacaa27ef..dea48b3131 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -159,6 +159,16 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); IBOutlet id o_screen_height_stp; IBOutlet id o_screen_follow_mouse_ckb; + /* QTK support */ + IBOutlet id o_qtk_view; + IBOutlet id o_qtk_lbl; + IBOutlet id o_qtk_long_lbl; + IBOutlet id o_qtk_device_pop; + IBOutlet id o_qtk_label_view; + + NSArray *qtkvideoDevices; + NSString *qtk_currdevice_uid; + BOOL b_autoplay; id o_currentCaptureView; NSString *o_file_slave_path; @@ -171,6 +181,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); - (void)setMRL:(NSString *)mrl; - (NSString *)MRL; +- (NSArray *)qtkvideoDevices; +- (void)qtkrefreshDevices; + - (void)setSubPanel; - (void)openTarget:(int)i_type; - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi; @@ -200,6 +213,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); - (void)openCapture; - (void)showCaptureView: theView; - (IBAction)openCaptureModeChanged:(id)sender; +- (IBAction)qtkChanged:(id)sender; - (IBAction)eyetvSwitchChannel:(id)sender; - (IBAction)eyetvLaunch:(id)sender; - (IBAction)eyetvGetPlugin:(id)sender; diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index c7be4370b9..06bd7f6d31 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -38,6 +38,9 @@ #include #include #include +#import +#import +#import #import "intf.h" #import "playlist.h" @@ -47,14 +50,14 @@ #include +NSArray *qtkvideoDevices; #define setEyeTVUnconnected \ -[o_capture_lbl setStringValue: _NS("No device connected")]; \ -[o_capture_long_lbl setStringValue: _NS("VLC could not detect any EyeTV compatible device.\n\nCheck the device's connection, make sure that the latest EyeTV software is installed and try again.")]; \ +[o_capture_lbl setStringValue: _NS("No device is selected")]; \ +[o_capture_long_lbl setStringValue: _NS("Any device is not selected.\n\nChose abailable device in above pull-down menu\n.")]; \ [o_capture_lbl displayIfNeeded]; \ [o_capture_long_lbl displayIfNeeded]; \ [self showCaptureView: o_capture_label_view] - /***************************************************************************** * GetEjectableMediaOfClass *****************************************************************************/ @@ -240,6 +243,27 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")]; [o_eyetv_getPlugin_btn setTitle: _NS("Download Plugin")]; + [self qtkvideoDevices]; + [o_qtk_device_pop removeAllItems]; + msg_Dbg( VLCIntf, "Found %lu capture devices", [qtkvideoDevices count] ); + if([qtkvideoDevices count] == 0){ + [o_qtk_device_pop addItemWithTitle: _NS("None")]; + [qtk_currdevice_uid release]; + }else { + if (!qtk_currdevice_uid) { + qtk_currdevice_uid = [[[QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeVideo] uniqueID] + stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; + } + for(int ivideo = 0; ivideo < [qtkvideoDevices count]; ivideo++){ + QTCaptureDevice *qtk_device; + qtk_device = [qtkvideoDevices objectAtIndex:ivideo]; + [o_qtk_device_pop addItemWithTitle: [qtk_device localizedDisplayName]]; + if([[[qtk_device uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_currdevice_uid]){ + [o_qtk_device_pop selectItemAtIndex:ivideo]; + } + } + } + [self setSubPanel]; [[NSNotificationCenter defaultCenter] addObserver: self @@ -464,6 +488,15 @@ static VLCOpen *_o_sharedMainInstance = nil; } } +- (IBAction)qtkChanged:(id)sender +{ + msg_Dbg( VLCIntf, "Changed UID: old %s", [qtk_currdevice_uid UTF8String] ); + qtk_currdevice_uid = [[[qtkvideoDevices objectAtIndex:[o_qtk_device_pop indexOfSelectedItem]] uniqueID] + stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; + msg_Dbg( VLCIntf, "Changed UID: new %s", [qtk_currdevice_uid UTF8String] ); + [self setMRL:[NSString stringWithFormat:@"qtcapture://%@", qtk_currdevice_uid]]; +} + - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi { NSString *o_label = [o_tvi label]; @@ -569,7 +602,6 @@ static VLCOpen *_o_sharedMainInstance = nil; - (void)openCapture { [self openCaptureModeChanged: nil]; - [self showCaptureView: o_capture_label_view]; [self openTarget: 3]; } @@ -662,7 +694,7 @@ static VLCOpen *_o_sharedMainInstance = nil; psz_class = kIOCDMediaClass; o_disc = o_type; b_no_menus = NO; b_title_chapter = YES; - } + } else if ( [o_type isEqualToString: _NS("Audio CD")]) { psz_class = kIOCDMediaClass; @@ -683,7 +715,7 @@ static VLCOpen *_o_sharedMainInstance = nil; if ( i_devices ) { - for( int i = 0; i < i_devices; i++ ) + for( int i = 0; i < i_devices; i++ ) { [o_disc_device addItemWithObjectValue: [o_devices objectAtIndex: i]]; @@ -768,7 +800,7 @@ static VLCOpen *_o_sharedMainInstance = nil; o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i:%i-", o_device, i_title, i_chapter]; else - o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", + o_mrl_string = [NSString stringWithFormat: @"dvdnav://%@", o_device]; } @@ -1058,13 +1090,20 @@ static VLCOpen *_o_sharedMainInstance = nil; } else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] ) { - [o_capture_lbl setStringValue: _NS("iSight Capture Input")]; - [o_capture_long_lbl setStringValue: _NS("This facility allows you to process your iSight's input signal.\n\nNo settings are available in this version, so you will be provided a 640px*480px raw video stream.\n\nLive Audio input is not supported.")]; - [o_capture_lbl displayIfNeeded]; - [o_capture_long_lbl displayIfNeeded]; - - [self showCaptureView: o_capture_label_view]; - [self setMRL: @"qtcapture://"]; + [self showCaptureView: o_qtk_view]; + [o_qtk_lbl setStringValue: _NS("iSight Capture Input")]; + [o_qtk_long_lbl setStringValue: _NS("This facility allows you to process your iSight's input signal.\n\nNo settings are available in this version, so you will be provided a 640px*480px raw video stream.\n\nLive Audio input is not supported.")]; + [o_qtk_lbl displayIfNeeded]; + [o_qtk_long_lbl displayIfNeeded]; + + if(!qtk_currdevice_uid) + { + [self setMRL: @""]; + } + else + { + [self setMRL:[NSString stringWithFormat:@"qtcapture://%@", qtk_currdevice_uid]]; + } } } @@ -1262,6 +1301,19 @@ static VLCOpen *_o_sharedMainInstance = nil; NSBeep(); } +- (NSArray *)qtkvideoDevices +{ + if (!qtkvideoDevices) + [self qtkrefreshDevices]; + return qtkvideoDevices; +} + +- (void)qtkrefreshDevices +{ + [qtkvideoDevices release]; + qtkvideoDevices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo] arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain]; +} + @end @implementation VLCOpenTextField