From 3366a5025807bfe9eb020fac978e4b39bbf5cebd Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 31 Dec 2014 14:36:40 +0000 Subject: [PATCH] specify correct flags for D3x00 series (all have preview) git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15302 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/library.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 1614455df..cf6e2679e 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -1079,13 +1079,13 @@ static struct { /* Stephan Barth at SUSE */ {"Nikon:DSC D5000 (PTP mode)", 0x04b0, 0x0423, PTP_CAP|PTP_CAP_PREVIEW}, /* IRC reporter */ - {"Nikon:DSC D3000 (PTP mode)", 0x04b0, 0x0424, PTP_CAP}, + {"Nikon:DSC D3000 (PTP mode)", 0x04b0, 0x0424, PTP_CAP|PTP_CAP_PREVIEW}, /* Andreas Dielacher */ {"Nikon:DSC D300s (PTP mode)", 0x04b0, 0x0425, PTP_CAP|PTP_CAP_PREVIEW}, /* Matthias Blaicher */ {"Nikon:DSC D3s (PTP mode)", 0x04b0, 0x0426, PTP_CAP|PTP_CAP_PREVIEW}, /* SWPLinux IRC reporter... does not have liveview -lowend model. */ - {"Nikon:DSC D3100 (PTP mode)", 0x04b0, 0x0427, PTP_CAP}, + {"Nikon:DSC D3100 (PTP mode)", 0x04b0, 0x0427, PTP_CAP|PTP_CAP_PREVIEW}, /* http://sourceforge.net/tracker/?func=detail&atid=358874&aid=3140014&group_id=8874 */ {"Nikon:DSC D7000 (PTP mode)", 0x04b0, 0x0428, PTP_CAP|PTP_CAP_PREVIEW}, @@ -1099,8 +1099,7 @@ static struct { {"Nikon:DSC D4", 0x04b0, 0x042b, PTP_CAP|PTP_CAP_PREVIEW}, /* Lihuijun */ - /* cheap version, but perhaps has hidden commands */ - {"Nikon:DSC D3200", 0x04b0, 0x042c, PTP_CAP/*|PTP_CAP_PREVIEW*/}, + {"Nikon:DSC D3200", 0x04b0, 0x042c, PTP_CAP|PTP_CAP_PREVIEW}, /* t.ludewig@gmail.com */ {"Nikon:DSC D600", 0x04b0, 0x042d, PTP_CAP|PTP_CAP_PREVIEW}, @@ -1116,7 +1115,7 @@ static struct { {"Nikon:DSC D5300", 0x04b0, 0x0431, PTP_CAP|PTP_CAP_PREVIEW}, /* https://sourceforge.net/p/gphoto/feature-requests/449/ */ - {"Nikon:DSC D3300", 0x04b0, 0x0433, PTP_CAP|PTP_CAP_PREVIEW|PTP_NIKON_BROKEN_CAP}, + {"Nikon:DSC D3300", 0x04b0, 0x0433, PTP_CAP|PTP_CAP_PREVIEW}, /* Andre Crone */ {"Nikon:DSC D610", 0x04b0, 0x0434, PTP_CAP|PTP_CAP_PREVIEW},