generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kind() method in track interface is changed to std::string to keep uniformity with other get methods

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/242003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@793 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org 2011-10-21 09:18:25 +00:00
parent 96ba19034c
commit ca8b3a387e
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.cc
View File

@ -49,8 +49,8 @@ AudioDeviceModule* AudioTrack::GetAudioDevice() {
} }
// Implement MediaStreamTrack // Implement MediaStreamTrack
const char* AudioTrack::kind() const { std::string AudioTrack::kind() const {
return kAudioTrackKind; return std::string(kAudioTrackKind);
} }
talk_base::scoped_refptr<AudioTrack> AudioTrack::CreateRemote( talk_base::scoped_refptr<AudioTrack> AudioTrack::CreateRemote(

2
third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.h
View File

@ -56,7 +56,7 @@ class AudioTrack : public MediaTrack<LocalAudioTrackInterface> {
virtual AudioDeviceModule* GetAudioDevice(); virtual AudioDeviceModule* GetAudioDevice();
// Implement MediaStreamTrack // Implement MediaStreamTrack
virtual const char* kind() const; virtual std::string kind() const;
protected: protected:
AudioTrack(const std::string& label, uint32 ssrc); AudioTrack(const std::string& label, uint32 ssrc);

2
third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream.h
View File

@ -78,7 +78,7 @@ class MediaStreamTrackInterface : public talk_base::RefCountInterface,
kFailed = 3, // Track negotiation failed. kFailed = 3, // Track negotiation failed.
}; };
virtual const char* kind() const = 0; virtual std::string kind() const = 0;
virtual std::string label() const = 0; virtual std::string label() const = 0;
virtual uint32 ssrc() const = 0; virtual uint32 ssrc() const = 0;
virtual bool enabled() const = 0; virtual bool enabled() const = 0;

2
third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.cc
View File

@ -85,7 +85,7 @@ void MediaStreamTrackProxy<T>::Init(MediaStreamTrackInterface* track) {
} }
template <class T> template <class T>
const char* MediaStreamTrackProxy<T>::kind() const { std::string MediaStreamTrackProxy<T>::kind() const {
return track_->kind(); return track_->kind();
} }

2
third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.h
View File

@ -48,7 +48,7 @@ class MediaStreamTrackProxy : public T,
void Init(MediaStreamTrackInterface* track); void Init(MediaStreamTrackInterface* track);
// Implement MediaStreamTrack. // Implement MediaStreamTrack.
virtual const char* kind() const; virtual std::string kind() const;
virtual std::string label() const; virtual std::string label() const;
virtual uint32 ssrc() const; virtual uint32 ssrc() const;
virtual bool enabled() const; virtual bool enabled() const;

4
third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.cc
View File

@ -57,8 +57,8 @@ VideoCaptureModule* VideoTrack::GetVideoCapture() {
return video_device_.get(); return video_device_.get();
} }
const char* VideoTrack::kind() const { std::string VideoTrack::kind() const {
return kVideoTrackKind; return std::string(kVideoTrackKind);
} }
talk_base::scoped_refptr<VideoTrack> VideoTrack::CreateRemote( talk_base::scoped_refptr<VideoTrack> VideoTrack::CreateRemote(

2
third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.h
View File

@ -58,7 +58,7 @@ class VideoTrack : public MediaTrack<LocalVideoTrackInterface> {
virtual void SetRenderer(VideoRendererWrapperInterface* renderer); virtual void SetRenderer(VideoRendererWrapperInterface* renderer);
VideoRendererWrapperInterface* GetRenderer(); VideoRendererWrapperInterface* GetRenderer();
virtual const char* kind() const; virtual std::string kind() const;
protected: protected:
VideoTrack(const std::string& label, uint32 ssrc); VideoTrack(const std::string& label, uint32 ssrc);