1.1 --- a/epoc32/include/mmf/common/midistandardcustomcommands.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mmf/common/midistandardcustomcommands.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -114,80 +114,6 @@
    1.16  	};
    1.17  
    1.18  /**
    1.19 -@internalComponent
    1.20 -*/
    1.21 -enum TMMFMidiControllerMessages
    1.22 -	{
    1.23 -	EMMFMidiControllerSetPositionMicroBeats,
    1.24 -	EMMFMidiControllerPositionMicroBeats,
    1.25 -	EMMFMidiControllerPlayNote,
    1.26 -	EMMFMidiControllerPlayNoteWithStartTime,
    1.27 -	EMMFMidiControllerStopNotes,
    1.28 -	EMMFMidiControllerNoteOn,
    1.29 -	EMMFMidiControllerNoteOff,
    1.30 -	EMMFMidiControllerPlaybackRate,
    1.31 -	EMMFMidiControllerSetPlaybackRate,
    1.32 -	EMMFMidiControllerMaxPlaybackRate,
    1.33 -	EMMFMidiControllerMinPlaybackRate,
    1.34 -	EMMFMidiControllerTempo,
    1.35 -	EMMFMidiControllerSetTempo,
    1.36 -	EMMFMidiControllerPitch,
    1.37 -	EMMFMidiControllerSetPitch,
    1.38 -	EMMFMidiControllerDurationMicroBeats,
    1.39 -	EMMFMidiControllerNumTracks,
    1.40 -	EMMFMidiControllerSetTrackMute,
    1.41 -	EMMFMidiControllerMimeType,
    1.42 -	EMMFMidiControllerSetSyncUpdateCallbackInterval,
    1.43 -	EMMFMidiControllerSendMessage,
    1.44 -	EMMFMidiControllerSendMessageWithTimeStamp,
    1.45 -	EMMFMidiControllerSendMipMessage,
    1.46 -	EMMFMidiControllerNumberOfBanks,
    1.47 -	EMMFMidiControllerGetBankId,
    1.48 -	EMMFMidiControllerLoadCustomBank,
    1.49 -	EMMFMidiControllerLoadCustomBankData,
    1.50 -	EMMFMidiControllerUnloadCustomBank,
    1.51 -	EMMFMidiControllerCustomBankLoaded,
    1.52 -	EMMFMidiControllerUnloadAllCustomBanks,
    1.53 -	EMMFMidiControllerNumberOfInstruments,
    1.54 -	EMMFMidiControllerGetInstrumentId,
    1.55 -	EMMFMidiControllerInstrumentName,
    1.56 -	EMMFMidiControllerCopyInstrumentName,
    1.57 -	EMMFMidiControllerSetInstrument,
    1.58 -	EMMFMidiControllerLoadCustomInstrument,
    1.59 -	EMMFMidiControllerLoadCustomInstrumentData,
    1.60 -	EMMFMidiControllerUnloadCustomInstrument,
    1.61 -	EMMFMidiControllerPercussionKeyName,
    1.62 -	EMMFMidiControllerCopyPercussionKeyName,
    1.63 -	EMMFMidiControllerSetStopTime,
    1.64 -	EMMFMidiControllerStopTime,
    1.65 -	EMMFMidiControllerPolyphony,
    1.66 -	EMMFMidiControllerSetMaxPolyphony,
    1.67 -	EMMFMidiControllerChannelsSupported,
    1.68 -	EMMFMidiControllerChannelVolume,
    1.69 -	EMMFMidiControllerMaxChannelVolume,
    1.70 -	EMMFMidiControllerSetChannelVolume,
    1.71 -	EMMFMidiControllerSetChannelMute,
    1.72 -	EMMFMidiControllerVolume,
    1.73 -	EMMFMidiControllerMaxVolume,
    1.74 -	EMMFMidiControllerSetVolume,
    1.75 -	EMMFMidiControllerSetVolumeRamp,
    1.76 -	EMMFMidiControllerGetBalance,
    1.77 -	EMMFMidiControllerSetBalance,
    1.78 -	EMMFMidiControllerGetRepeats,
    1.79 -	EMMFMidiControllerSetRepeats,
    1.80 -	EMMFMidiControllerSetBank,
    1.81 -	EMMFMidiControllerIsTrackMute,
    1.82 -	EMMFMidiControllerIsChannelMute,
    1.83 -	EMMFMidiControllerGetInstrument,
    1.84 -	EMMFMidiControllerClose,
    1.85 -	EMMFMidiControllerStop,
    1.86 -	EMMFMidiControllerReceiveEvents,
    1.87 -	EMMFMidiControllerRetrieveEvent,
    1.88 -	EMMFMidiControllerCancelReceiveEvents,
    1.89 -	EMMFMidiControllerMaxPolyphony
    1.90 -	};
    1.91 -
    1.92 -/**
    1.93  Client class to access functionality specific to a MIDI controller.
    1.94  The class uses the custom command function of the controller plugin, and removes the necessity
    1.95  for the client to formulate the custom commands.
    1.96 @@ -895,25 +821,6 @@
    1.97  
    1.98  
    1.99  /**
   1.100 -@internalComponent
   1.101 -*/
   1.102 -class CMidiEventReceiver : public CBase
   1.103 -	{
   1.104 -public:
   1.105 -	static CMidiEventReceiver* NewL(const TMMFMessage& aMessage);
   1.106 -	~CMidiEventReceiver();
   1.107 -	void PrepareEventL(const CMMFMidiEvent& aEvent);
   1.108 -	void SendEventL(TMMFMessage& aMessage);
   1.109 -	TBool IsWaitingToSendEvent();
   1.110 -private:
   1.111 -	CMidiEventReceiver(const TMMFMessage& aMessage);
   1.112 -private:
   1.113 -	TMMFMessage iMessage;
   1.114 -	CBufFlat* iEventBuf;
   1.115 -	};
   1.116 -
   1.117 -
   1.118 -/**
   1.119  Mixin class to define an object capable of handling a MIDI event within the controller framework.
   1.120  
   1.121  @publishedAll
   1.122 @@ -932,6 +839,11 @@
   1.123  	virtual TInt SendMidiEventToClient(const CMMFMidiEvent& aEvent) = 0;
   1.124  	};
   1.125  
   1.126 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
   1.127 +#include <mmf/common/midieventreceiver.h>
   1.128 +#endif
   1.129 +
   1.130 +class CMidiEventReceiver;
   1.131  
   1.132  /**
   1.133  Custom command parser class to be used by controller plugins wishing to support