[vlc-devel] [PATCH 1/2] Support disc drives probing for OS/2
KO Myung-Hun
komh78 at gmail.com
Sun Apr 29 14:50:24 CEST 2012
---
modules/gui/qt4/components/open_panels.cpp | 45 ++++++++++++++++++++++++++-
modules/gui/qt4/components/open_panels.hpp | 2 +-
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index b369a39..dbb1be4 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -337,7 +337,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
ui.deviceCombo->setToolTip( qtr(I_DEVICE_TOOLTIP) );
ui.deviceCombo->setInsertPolicy( QComboBox::InsertAtTop );
-#ifndef WIN32
+#if !defined( WIN32 ) && !defined( __OS2__ )
char const * const ppsz_discdevices[] = {
"sr*",
"sg*",
@@ -403,6 +403,47 @@ void DiscOpenPanel::onFocus()
SetErrorMode(oldMode);
}
}
+#elif defined( __OS2__ ) /* Disc drives probing for OS/2 */
+void DiscOpenPanel::onFocus()
+{
+
+ ui.deviceCombo->clear();
+
+#define IOCTL_CDROMDISK2 0x82
+#define CDROMDISK2_DRIVELETTERS 0x60
+
+ HFILE hcd2;
+ ULONG ulAction;
+ ULONG ulParamLen;
+ ULONG ulData;
+ ULONG ulDataLen;
+
+ if( DosOpen(( PSZ )"CD-ROM2$", ( PHFILE )&hcd2, &ulAction, 0, FILE_NORMAL,
+ OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
+ OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE,
+ NULL ))
+ return;
+
+ if( !DosDevIOCtl( hcd2, IOCTL_CDROMDISK2, CDROMDISK2_DRIVELETTERS,
+ NULL, 0, &ulParamLen, &ulData, sizeof( ulData ), &ulDataLen ))
+ {
+ char szDriveName[] = "X:\\";
+
+ int count = LOUSHORT( ulData );
+ int drive = HIUSHORT( ulData );
+
+ for( ; count; --count, ++drive )
+ {
+ szDriveName[ 0 ] = 'A' + drive;
+
+ QString name = qfu( szDriveName );
+
+ ui.deviceCombo->addItem( name, name );
+ }
+ }
+
+ DosClose( hcd2 );
+}
#endif
DiscOpenPanel::~DiscOpenPanel()
@@ -421,7 +462,7 @@ void DiscOpenPanel::clear()
m_discType = None;
}
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
#define setDrive( psz_name ) {\
int index = ui.deviceCombo->findText( qfu( psz_name ) ); \
if( index != -1 ) ui.deviceCombo->setCurrentIndex( index );}
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 137afb5..4b9cbfc 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -174,7 +174,7 @@ public:
virtual ~DiscOpenPanel();
virtual void clear() ;
virtual void accept() ;
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
virtual void onFocus();
#endif
private:
--
1.7.3.2
More information about the vlc-devel
mailing list