Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6470/client_libs/libplayerc++
Modified Files:
playerc++.h
Log Message:
Removed deprecated energy, sound and truth interfaces.
Index: playerc++.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerc++.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** playerc++.h 31 Jul 2007 04:14:26 -0000 1.93
--- playerc++.h 4 Aug 2007 03:12:07 -0000 1.94
***************
*** 562,592 ****
};
- // /**
- // The @p EnergyProxy class is used to read from an @ref
- // interface_energy device.
- // */
- // class EnergyProxy : public ClientProxy
- // {
- // private:
- //
- // void Subscribe(uint aIndex);
- // void Unsubscribe();
- //
- // // libplayerc data structure
- // playerc_energy_t *mDevice;
- //
- // public:
- //
- // EnergyProxy(PlayerClient *aPc, uint aIndex=0);
- // ~EnergyProxy();
- //
- // /** These members give the current amount of energy stored [Joules] */
- // uint GetJoules() const { return GetVar(mDevice->joules); };
- // /** the amount of energy current being consumed [Watts] */
- // uint GetWatts() const { return GetVar(mDevice->watts); };
- // /** The charging flag is true if we are currently charging, else
false. */
- // bool GetCharging() const { return GetVar(mDevice->charging); };
- // };
-
/**
The @p FiducialProxy class is used to control @ref
--- 562,565 ----
***************
*** 2289,2317 ****
};
- // /**
- // The @p SoundProxy class is used to control a @ref interface_sound
- // device, which allows you to play pre-recorded sound files on a robot.
- // */
- // class SoundProxy : public ClientProxy
- // {
- //
- // private:
- //
- // void Subscribe(uint aIndex);
- // void Unsubscribe();
- //
- // // libplayerc data structure
- // playerc_sound_t *mDevice;
- //
- // public:
- // // Constructor
- // SoundProxy(PlayerClient *aPc, uint aIndex=0);
- //
- // ~SoundProxy();
- //
- // /** Play the sound indicated by the index. */
- // void Play(int aIndex);
- // };
-
/**
The @p SpeechProxy class is used to control a @ref interface_speech
--- 2262,2265 ----
***************
*** 2368,2422 ****
};
- // /**
- // The @p WaveformProxy class is used to read raw digital waveforms from
- // a @ref interface_waveform device. */
- // class WaveformProxy : public ClientProxy
- // {
- //
- // private:
- //
- // void Subscribe(uint aIndex);
- // void Unsubscribe();
- //
- // // libplayerc data structure
- // playerc_waveform_t *mDevice;
- //
- // public:
- // /// Constructor
- // WaveformProxy(PlayerClient *aPc, uint aIndex=0);
- //
- // /// Destructor
- // ~WaveformProxy();
- //
- // /// How many samples?
- // uint GetCount() const { return GetVar(mDevice->data_count); };
- //
- // /// sample rate in bits per second
- // uint GetBitRate() const { return GetVar(mDevice->rate); };
- //
- // /// sample depth in bits
- // uint GetDepth() const { return GetVar(mDevice->depth); };
- //
- // /// the data is buffered here for playback
- // void GetImage(uint8_t* aBuffer) const
- // {
- // return GetVarByRef(mDevice->data,
- // mDevice->data+GetCount(),
- // aBuffer);
- // };
- //
- // // dsp file descriptor
- // //uint GetFd() const { return GetVar(mDevice->fd); };
- //
- // /// set up the DSP to the current bitrate and depth
- // void ConfigureDSP(uint aBitRate, uint aDepth);
- //
- // /// open the sound device
- // void OpenDSPforWrite();
- //
- // /// Play the waveform through the DSP
- // void Play();
- // };
-
/**
The @p WiFiProxy class controls a @ref interface_wifi device. */
--- 2316,2319 ----
***************
*** 2525,2529 ****
std::ostream& operator << (std::ostream& os, const PlayerCc::CameraProxy&
c);
std::ostream& operator << (std::ostream& os, const PlayerCc::DioProxy& c);
- //std::ostream& operator << (std::ostream& os, const PlayerCc::EnergyProxy&
c);
std::ostream& operator << (std::ostream& os, const PlayerCc::FiducialProxy&
c);
std::ostream& operator << (std::ostream& os, const PlayerCc::GpsProxy& c);
--- 2422,2425 ----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
