--- a/videocollection/mpxmyvideoscollection/src/vcxmyvideosdrivemonitor.cpp Tue May 25 12:44:54 2010 +0300
+++ b/videocollection/mpxmyvideoscollection/src/vcxmyvideosdrivemonitor.cpp Wed Jun 09 09:44:23 2010 +0300
@@ -155,46 +155,6 @@
}
}
-#if 0 // not used in mpx my videos collection
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::RegisterObserverL
-// -----------------------------------------------------------------------------
-//
-void CVcxMyVideosDriveMonitor::RegisterObserverL( MVcxMyVideosDriveMonitorObserver* aObserver )
- {
- iObservers.AppendL( aObserver );
-
- if ( !IsActive() )
- {
- iFs.NotifyChange( ENotifyDisk, iStatus );
- SetActive();
- }
- }
-
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::RemoveObserverL
-// -----------------------------------------------------------------------------
-//
-void CVcxMyVideosDriveMonitor::RemoveObserverL( MVcxMyVideosDriveMonitorObserver* aObserver )
- {
- TInt i;
- for ( i = 0; i < iObservers.Count(); i++ )
- {
- if ( aObserver == iObservers[i] )
- {
- iObservers.Remove( i );
- iObservers.Compress();
- break;
- }
- }
-
- if ( iObservers.Count() == 0 )
- {
- iFs.NotifyChangeCancel();
- }
- }
-#endif
-
/*
N96 without memory card:
26/09/2007 11:37:22 CIptvDriveMonitor:: drive[2]: type = EMediaNANDFlash
@@ -471,111 +431,6 @@
}
return KErrNotFound;
}
-
-#if 0 // not used by mpx my videos collection
-
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::PhoneMemoryDriveL
-// -----------------------------------------------------------------------------
-//
-TInt CVcxMyVideosDriveMonitor::PhoneMemoryDriveL()
- {
- TInt drive;
- User::LeaveIfError( drive = PhoneMemoryDrive() );
- return drive;
- }
-
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::PhoneMemoryDrive
-// -----------------------------------------------------------------------------
-//
-TInt CVcxMyVideosDriveMonitor::PhoneMemoryDrive()
- {
- TInt i;
- for ( i = 0; i < iAvailableDrives.Count(); i++ )
- {
- if ( iAvailableDrives[i].iDrive == EDriveC )
- {
- return iAvailableDrives[i].iDrive;
- }
- }
- return KErrNotFound;
- }
-
-
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::FixedDriveL
-// -----------------------------------------------------------------------------
-//
-TInt CVcxMyVideosDriveMonitor::FixedDriveL( TBool aExcludeCDrive )
- {
- TInt drive;
- User::LeaveIfError( drive = FixedDrive( aExcludeCDrive ) );
- return drive;
- }
-
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::FixedDrive
-// -----------------------------------------------------------------------------
-//
-TInt CVcxMyVideosDriveMonitor::FixedDrive( TBool aExcludeCDrive )
- {
- TInt i;
- for ( i = 0; i < iAvailableDrives.Count(); i++ )
- {
- MPX_DEBUG2("CVcxMyVideosDriveMonitor:: iAvailableDrives[%d]", i);
-
- if ( !(iAvailableDrives[i].iFlags & TVcxMyVideosDriveInfo::ERemovable) )
- {
- if ( iAvailableDrives[i].iDrive != EDriveC )
- {
- MPX_DEBUG2("CVcxMyVideosDriveMonitor:: FixedDrive() returning drive %d", iAvailableDrives[i].iDrive);
- return iAvailableDrives[i].iDrive;
- }
- else
- {
- if ( !aExcludeCDrive )
- {
- MPX_DEBUG2("CVcxMyVideosDriveMonitor:: FixedDrive() returning drive %d", iAvailableDrives[i].iDrive);
- return iAvailableDrives[i].iDrive;
- }
- }
- }
- }
- MPX_DEBUG1("CVcxMyVideosDriveMonitor:: FixedDrive() fixed drive not found");
- return KErrNotFound;
- }
-
-// -----------------------------------------------------------------------------
-// CVcxMyVideosDriveMonitor::IsMmcInserted()
-// -----------------------------------------------------------------------------
-//
-TBool CVcxMyVideosDriveMonitor::IsMmcInserted()
- {
- TInt drive = MemoryCardDrive();
-
- if ( drive == KErrNotFound )
- {
- return EFalse;
- }
-
- TInt arrayPos = ArrayPos( drive );
-
- if ( arrayPos == KErrNotFound )
- {
- return EFalse;
- }
-
- TUint32 flags = iAvailableDrives[arrayPos].iFlags;
-
- if ( (flags & TVcxMyVideosDriveInfo::ELocked) || (flags & TVcxMyVideosDriveInfo::EMediaNotPresent) )
- {
- return EFalse;
- }
-
- return ETrue;
- }
-#endif
// -----------------------------------------------------------------------------
// CVcxMyVideosDriveMonitor::RunL()