From: Felix Paul Kühne Date: Sat, 16 Jul 2011 14:37:52 +0000 (+0200) Subject: macosx: exposed qtcapture's width and height options in the open panel X-Git-Tag: 1.2.0-pre1~1747 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b3ff877a89d3d14022e36e1cd5f9f41b0a84cb5a;p=vlc macosx: exposed qtcapture's width and height options in the open panel moved some elements around and renamed them within the 'Capture' tab it's no longer called an 'iSight input', etc. --- 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 36f16c5ae7..4b8d93bbfc 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib @@ -12,7 +12,12 @@ YES - + + + + + + YES @@ -146,7 +151,7 @@ 1 - + 256 YES @@ -476,7 +481,6 @@ {{10, 33}, {528, 232}} - File @@ -710,7 +714,7 @@ - + 256 YES @@ -787,20 +791,21 @@ {{10, 33}, {528, 232}} + Capture - + 0 YES YES YES - + @@ -2783,14 +2788,14 @@ c3ViX2FsaWduX2xibDsKCg YES - + 256 YES 256 - {{17, 185}, {494, 17}} + {{17, 151}, {494, 17}} YES @@ -2810,7 +2815,7 @@ c3ViX2FsaWduX2xibDsKCg 256 - {{17, 127}, {494, 44}} + {{17, 93}, {494, 44}} YES @@ -2827,7 +2832,7 @@ ZCBWTEMncyBFeWVUViBwbHVnaW4uA 256 - {{264, 79}, {159, 32}} + {{264, 45}, {159, 32}} YES @@ -2850,7 +2855,7 @@ ZCBWTEMncyBFeWVUViBwbHVnaW4uA 256 - {{105, 79}, {159, 32}} + {{105, 45}, {159, 32}} YES @@ -2872,18 +2877,19 @@ ZCBWTEMncyBFeWVUViBwbHVnaW4uA {528, 222} + NSView NSResponder - + 256 YES 256 - {{17, 185}, {494, 17}} + {{17, 148}, {494, 17}} YES @@ -2899,7 +2905,7 @@ ZCBWTEMncyBFeWVUViBwbHVnaW4uA 256 - {{17, 94}, {494, 70}} + {{17, 57}, {494, 70}} YES @@ -2916,20 +2922,21 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA {528, 222} + NSView NSResponder - + 256 YES 256 - {{91, 124}, {178, 32}} + {{95, 90}, {178, 32}} YES @@ -2952,7 +2959,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 256 - {{269, 124}, {178, 32}} + {{273, 90}, {178, 32}} YES @@ -2975,7 +2982,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 256 - {{9, 184}, {253, 17}} + {{13, 150}, {253, 17}} YES @@ -2991,7 +2998,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 256 - {{264, 178}, {155, 26}} + {{268, 144}, {155, 26}} YES @@ -3062,7 +3069,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA -2147482368 - {{12, 88}, {16, 16}} + {{16, 54}, {16, 16}} 20746 100 @@ -3070,7 +3077,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA -2147483392 - {{33, 91}, {477, 11}} + {{37, 57}, {477, 11}} YES @@ -3089,42 +3096,27 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA {527, 222} + NSView NSResponder - + 256 YES - - - 256 - {{17, 185}, {494, 17}} - - YES - - 67239424 - 138412032 - Screen Capture Input - - - - - - 256 - {{17, 153}, {494, 14}} + {{17, 159}, {494, 28}} YES 67239424 138412032 - This facility allows you to process your screen's output. + This input allows you to save, stream or display your current screen contents. @@ -3497,7 +3489,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA - {{17, 16}, {494, 123}} + {{17, 30}, {494, 123}} {0, 0} @@ -3519,40 +3511,25 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA {528, 222} + NSView NSResponder - + 256 YES - - - 256 - {{17, 185}, {494, 17}} - - YES - - 67239424 - 138412032 - Screen Capture Input - - - - - - 256 - {{17, 153}, {494, 14}} + {{17, 157}, {494, 32}} YES 67239424 138412032 - This facility allows you to process your screen's output. + This input allows you to process input signals from QuickTime-compatible video devices.\nLive Audio input is not supported. @@ -3572,7 +3549,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 268 - {{120, 47}, {286, 26}} + {{102, 84}, {286, 26}} YES @@ -3635,12 +3612,110 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA 2 + + + 256 + {{189, 49}, {43, 19}} + + YES + + -1804468671 + 138544128 + 0 + + + YES + + + + + + + 256 + {{28, 51}, {156, 14}} + + YES + + 67239424 + 71434240 + Image width: + + + + + + + + + 256 + {{396, 49}, {43, 19}} + + YES + + -1804468671 + 138544128 + 0 + + + YES + + + + + + + 256 + {{257, 51}, {134, 14}} + + YES + + 67239424 + 71434240 + Image height: + + + + + + + + + 256 + {{238, 47}, {15, 22}} + + YES + + 917024 + 131072 + + 2000 + 20 + YES + YES + + + + + 256 + {{446, 47}, {15, 22}} + + YES + + 917024 + 131072 + + 1000 + 20 + YES + YES + + {{2, 2}, {490, 119}} - {{17, 16}, {494, 123}} + {{17, 28}, {494, 123}} {0, 0} @@ -3662,6 +3737,7 @@ cmUgaXMgaW5zdGFsbGVkIGFuZCB0cnkgYWdhaW4uA {528, 222} + NSView NSResponder @@ -6246,14 +6322,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2356 - - - o_screen_lbl - - - - 2357 - o_screen_long_lbl @@ -6830,14 +6898,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 3068 - - - o_qtk_lbl - - - - 3069 - o_qtk_long_lbl @@ -7438,6 +7498,102 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 3345 + + + takeIntValueFrom: + + + + 3358 + + + + nextKeyView + + + + 3359 + + + + takeIntValueFrom: + + + + 3360 + + + + takeIntValueFrom: + + + + 3361 + + + + takeIntValueFrom: + + + + 3362 + + + + o_capture_height_fld + + + + 3364 + + + + o_capture_height_lbl + + + + 3365 + + + + o_capture_width_fld + + + + 3366 + + + + o_capture_width_lbl + + + + 3367 + + + + nextKeyView + + + + 3368 + + + + o_capture_width_stp + + + + 3369 + + + + o_capture_height_stp + + + + 3370 + @@ -8046,7 +8202,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES - @@ -8061,15 +8216,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - 2348 - - - YES - - - - 2787 @@ -8078,19 +8224,19 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - - - - - + + + + + + @@ -8468,11 +8614,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - 2959 - - - 2976 @@ -9855,9 +9996,8 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES - - + QTKit @@ -9868,15 +10008,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES - - - - - 3015 - - - YES - + + + + + + @@ -9894,11 +10031,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - - 3018 - - - 3071 @@ -10634,6 +10766,90 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA + + 3346 + + + YES + + + + + + 3347 + + + YES + + + + + + 3348 + + + YES + + + + + + 3349 + + + YES + + + + + + 3350 + + + YES + + + + + + 3351 + + + YES + + + + + + 3352 + + + + + 3353 + + + + + 3354 + + + + + 3355 + + + + + 3356 + + + + + 3357 + + + @@ -10907,9 +11123,8 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2346.IBViewBoundsToFrameTransform 2346.ImportedFromIB2 2347.IBPluginDependency + 2347.IBViewBoundsToFrameTransform 2347.ImportedFromIB2 - 2348.IBPluginDependency - 2348.ImportedFromIB2 2349.IBPluginDependency 2349.ImportedFromIB2 2351.IBPluginDependency @@ -10921,16 +11136,20 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2366.IBPluginDependency 2366.ImportedFromIB2 2492.IBPluginDependency + 2492.IBViewBoundsToFrameTransform 2492.ImportedFromIB2 2493.IBPluginDependency + 2493.IBViewBoundsToFrameTransform 2493.ImportedFromIB2 2494.IBPluginDependency 2494.ImportedFromIB2 2495.IBPluginDependency 2495.ImportedFromIB2 2496.IBPluginDependency + 2496.IBViewBoundsToFrameTransform 2496.ImportedFromIB2 2497.IBPluginDependency + 2497.IBViewBoundsToFrameTransform 2497.ImportedFromIB2 2498.IBPluginDependency 2498.ImportedFromIB2 @@ -10940,14 +11159,17 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2508.ImportedFromIB2 269.ImportedFromIB2 2771.IBPluginDependency + 2771.IBViewBoundsToFrameTransform 2771.ImportedFromIB2 2772.IBPluginDependency 2772.ImportedFromIB2 2773.IBPluginDependency + 2773.IBViewBoundsToFrameTransform 2773.ImportedFromIB2 2774.IBPluginDependency 2774.ImportedFromIB2 2787.IBPluginDependency + 2787.IBViewBoundsToFrameTransform 2787.ImportedFromIB2 2792.IBEditorWindowLastContentRect 2792.IBPluginDependency @@ -11096,7 +11318,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 2956.IBPluginDependency 2957.IBPluginDependency 2958.IBPluginDependency - 2959.IBPluginDependency 2960.IBPluginDependency 2961.IBPluginDependency 2962.IBPluginDependency @@ -11146,13 +11367,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 3013.IBPluginDependency 3013.ImportedFromIB2 3014.IBPluginDependency + 3014.IBViewBoundsToFrameTransform 3014.ImportedFromIB2 - 3015.IBPluginDependency - 3015.ImportedFromIB2 3016.IBPluginDependency + 3016.IBViewBoundsToFrameTransform 3016.ImportedFromIB2 3017.IBPluginDependency - 3018.IBPluginDependency 3071.IBPluginDependency 3071.IBViewBoundsToFrameTransform 3072.IBPluginDependency @@ -11346,6 +11566,30 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA 3342.IBPluginDependency 3342.IBViewBoundsToFrameTransform 3343.IBPluginDependency + 3346.IBPluginDependency + 3346.IBViewBoundsToFrameTransform + 3346.ImportedFromIB2 + 3347.IBPluginDependency + 3347.IBViewBoundsToFrameTransform + 3347.ImportedFromIB2 + 3348.IBPluginDependency + 3348.IBViewBoundsToFrameTransform + 3348.ImportedFromIB2 + 3349.IBPluginDependency + 3349.IBViewBoundsToFrameTransform + 3349.ImportedFromIB2 + 3350.IBPluginDependency + 3350.IBViewBoundsToFrameTransform + 3350.ImportedFromIB2 + 3351.IBPluginDependency + 3351.IBViewBoundsToFrameTransform + 3351.ImportedFromIB2 + 3352.IBPluginDependency + 3353.IBPluginDependency + 3354.IBPluginDependency + 3355.IBPluginDependency + 3356.IBPluginDependency + 3357.IBPluginDependency 408.ImportedFromIB2 636.IBEditorWindowLastContentRect 636.IBPluginDependency @@ -11611,7 +11855,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin - {{152, 100}, {528, 222}} + {{330, 100}, {528, 222}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -11621,7 +11865,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin - {{0, 501}, {527, 222}} + {{330, 501}, {527, 222}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -11660,6 +11904,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw0gAAA + com.apple.InterfaceBuilder.CocoaPlugin @@ -11672,18 +11919,28 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDPQAAwp4AAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABB4AAAwpgAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDxgAAwp4AAA + com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDgIAAwpgAAA + com.apple.InterfaceBuilder.CocoaPlugin @@ -11693,14 +11950,23 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin + + AUNuAABCcAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUPfAABCcAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUGIAABCFAAAA + {{343, 347}, {656, 249}} com.apple.InterfaceBuilder.CocoaPlugin @@ -11884,7 +12150,6 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin P4AAAL+AAABBkAAAwtoAAA @@ -11905,16 +12170,19 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUGIAABBgAAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwy8AAA + com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABC4gAAwpAAAA + P4AAAL+AAABC7AAAws4AAA com.apple.InterfaceBuilder.CocoaPlugin {{581, 644}, {286, 63}} @@ -12189,6 +12457,42 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA P4AAAL+AAABCZAAAw1AAAA com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDiIAAwiQAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABC4AAAwhgAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD8AAAwiQAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDqoAAwhgAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + AUOhAABBsAAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + AUQEgABBsAAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{329, 376}, {574, 380}} com.apple.InterfaceBuilder.CocoaPlugin @@ -12251,7 +12555,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA - 3345 + 3370 @@ -12637,10 +12941,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES o_btn_cancel o_btn_ok + o_capture_height_fld + o_capture_height_lbl + o_capture_height_stp o_capture_label_view o_capture_lbl o_capture_long_lbl o_capture_mode_pop + o_capture_width_fld + o_capture_width_lbl + o_capture_width_stp o_currentCaptureView o_currentOpticalMediaView o_disc_audiocd_bdmv_btn @@ -12932,6 +13242,12 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA id id id + id + id + id + id + id + id @@ -12940,10 +13256,16 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES o_btn_cancel o_btn_ok + o_capture_height_fld + o_capture_height_lbl + o_capture_height_stp o_capture_label_view o_capture_lbl o_capture_long_lbl o_capture_mode_pop + o_capture_width_fld + o_capture_width_lbl + o_capture_width_stp o_currentCaptureView o_currentOpticalMediaView o_disc_audiocd_bdmv_btn @@ -13096,6 +13418,18 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA o_btn_ok id + + o_capture_height_fld + id + + + o_capture_height_lbl + id + + + o_capture_height_stp + id + o_capture_label_view id @@ -13112,6 +13446,18 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA o_capture_mode_pop id + + o_capture_width_fld + id + + + o_capture_width_lbl + id + + + o_capture_width_stp + id + o_currentCaptureView id 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 881e546b37..9cb136f4d0 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/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index e39ecbd8fd..602be26bab 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -465,6 +465,7 @@ CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = ""; }; CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = ""; }; + CC9E3E7913D1CFCF00429A71 /* qtcapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = qtcapture.m; path = ../../../modules/access/qtcapture.m; sourceTree = ""; }; CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; }; CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; }; CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; @@ -869,6 +870,7 @@ CC4D67F71348F601003FCC5B /* darwin_specific.c */, CC6C01BA0DDF3EEC00C7D754 /* auhal.c */, CCC895830D9A8A82005AE59C /* eyetv.m */, + CC9E3E7913D1CFCF00429A71 /* qtcapture.m */, ); name = "OSX-specific source files"; sourceTree = ""; diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index 4f40012cb8..f671c6074f 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -178,7 +178,6 @@ /* screen support */ IBOutlet id o_screen_view; - IBOutlet id o_screen_lbl; IBOutlet id o_screen_long_lbl; IBOutlet id o_screen_fps_fld; IBOutlet id o_screen_fps_lbl; @@ -199,10 +198,15 @@ /* 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; + IBOutlet id o_capture_width_lbl; + IBOutlet id o_capture_width_fld; + IBOutlet id o_capture_width_stp; + IBOutlet id o_capture_height_lbl; + IBOutlet id o_capture_height_fld; + IBOutlet id o_capture_height_stp; NSArray *qtkvideoDevices; NSString *qtk_currdevice_uid; diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 48c13750a3..bc31711d05 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -176,11 +176,10 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES]; [o_capture_mode_pop removeAllItems]; - [o_capture_mode_pop addItemWithTitle: @"iSight"]; + [o_capture_mode_pop addItemWithTitle: _NS("Capture Device")]; [o_capture_mode_pop addItemWithTitle: _NS("Screen")]; [o_capture_mode_pop addItemWithTitle: @"EyeTV"]; - [o_screen_lbl setStringValue: _NS("Screen Capture Input")]; - [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")]; + [o_screen_long_lbl setStringValue: _NS("This input allows you to save, stream or display your current screen contents.")]; [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")]; [o_screen_left_lbl setStringValue: _NS("Subscreen left:")]; [o_screen_top_lbl setStringValue: _NS("Subscreen top:")]; @@ -195,6 +194,9 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_eyetv_noInstanceLong_lbl setStringValue: _NS("VLC could not connect to EyeTV.\nMake sure that you installed VLC's EyeTV plugin.")]; [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")]; [o_eyetv_getPlugin_btn setTitle: _NS("Download Plugin")]; + [o_qtk_long_lbl setStringValue: _NS("This input allows you to process input signals from QuickTime-compatible video devices.\nLive Audio input is not supported.")]; + [o_capture_width_lbl setStringValue: _NS("Image width:")]; + [o_capture_height_lbl setStringValue: _NS("Image height:")]; [self qtkvideoDevices]; [o_qtk_device_pop removeAllItems]; @@ -408,6 +410,7 @@ static VLCOpen *_o_sharedMainInstance = nil; if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] ) { if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] ) + { [o_options addObject: [NSString stringWithFormat: @"screen-fps=%f", [o_screen_fps_fld floatValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-left=%i", [o_screen_left_fld intValue]]]; [o_options addObject: [NSString stringWithFormat: @"screen-top=%i", [o_screen_top_fld intValue]]]; @@ -417,6 +420,12 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_options addObject: @"screen-follow-mouse"]; else [o_options addObject: @"no-screen-follow-mouse"]; + } + else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Capture Device")] ) + { + [o_options addObject: [NSString stringWithFormat: @"qtcapture-width=%i", [o_capture_width_fld intValue]]]; + [o_options addObject: [NSString stringWithFormat: @"qtcapture-height=%i", [o_capture_height_fld intValue]]]; + } } /* apply the options to our item(s) */ @@ -430,10 +439,14 @@ static VLCOpen *_o_sharedMainInstance = nil; - (IBAction)qtkChanged:(id)sender { - msg_Dbg( VLCIntf, "Changed UID: old %s", [qtk_currdevice_uid UTF8String] ); + NSValue *sizes = [[[[qtkvideoDevices objectAtIndex:[o_qtk_device_pop indexOfSelectedItem]] formatDescriptions] objectAtIndex: 0] attributeForKey: QTFormatDescriptionVideoEncodedPixelsSizeAttribute]; + + [o_capture_width_fld setIntValue: [sizes sizeValue].width]; + [o_capture_height_fld setIntValue: [sizes sizeValue].height]; + [o_capture_width_stp setIntValue: [o_capture_width_fld intValue]]; + [o_capture_height_stp setIntValue: [o_capture_height_fld intValue]]; 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]]; } @@ -1144,22 +1157,16 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_screen_top_fld setIntValue: config_GetInt( p_intf, "screen-top" )]; [o_screen_follow_mouse_ckb setIntValue: config_GetInt( p_intf, "screen-follow-mouse" )]; } - else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] ) + else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Capture Device")] ) { [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 ([o_capture_width_fld intValue] <= 0) + [self qtkChanged:nil]; if(!qtk_currdevice_uid) - { [self setMRL: @""]; - } else - { [self setMRL:[NSString stringWithFormat:@"qtcapture://%@", qtk_currdevice_uid]]; - } } }