102b2270c7
I made several updates to the Windows version as well so that both implementations share a big portion of the code. The underlying PeerConnection notifications have changed a bit since the last update so that there's still a known issue that I plan to fix in my next change: // TODO(tommi): There's a problem now with terminating connections: // When ending a conversation, both peers now send a signaling message // that indicates that their ports are closed (port=0). The trouble this // causes us here is that we can interpret such a message as an invite // to a new conversation. So, currently there is a bug that ending // a conversation can immediately start a new one. // To fix this I plan to change how conversations start and have a special // notification message via the server that prepares a client for a // conversation instead of automatically recognizing the first signaling // message as an invite. Review URL: http://webrtc-codereview.appspot.com/112008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@446 4adac7df-926f-26a2-2b94-8c16560cd09d
118 lines
3.1 KiB
C++
118 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef PEERCONNECTION_SAMPLES_CLIENT_CONDUCTOR_H_
|
|
#define PEERCONNECTION_SAMPLES_CLIENT_CONDUCTOR_H_
|
|
#pragma once
|
|
|
|
#include <deque>
|
|
#include <string>
|
|
|
|
#include "peerconnection/samples/client/main_wnd.h"
|
|
#include "peerconnection/samples/client/peer_connection_client.h"
|
|
#include "talk/app/webrtc/peerconnection.h"
|
|
#include "talk/app/webrtc/peerconnectionfactory.h"
|
|
#include "talk/base/scoped_ptr.h"
|
|
|
|
namespace cricket {
|
|
class VideoRenderer;
|
|
} // namespace cricket
|
|
|
|
class Conductor
|
|
: public webrtc::PeerConnectionObserver,
|
|
public PeerConnectionClientObserver,
|
|
public MainWndCallback {
|
|
public:
|
|
enum CallbackID {
|
|
MEDIA_CHANNELS_INITIALIZED = 1,
|
|
PEER_CONNECTION_CLOSED,
|
|
SEND_MESSAGE_TO_PEER,
|
|
PEER_CONNECTION_ADDSTREAMS,
|
|
PEER_CONNECTION_CONNECT,
|
|
PEER_CONNECTION_ERROR,
|
|
};
|
|
|
|
Conductor(PeerConnectionClient* client, MainWindow* main_wnd);
|
|
~Conductor();
|
|
|
|
bool connection_active() const;
|
|
|
|
virtual void Close();
|
|
|
|
protected:
|
|
bool InitializePeerConnection();
|
|
void DeletePeerConnection();
|
|
void StartCaptureDevice();
|
|
void AddStreams();
|
|
|
|
//
|
|
// PeerConnectionObserver implementation.
|
|
//
|
|
|
|
virtual void OnInitialized();
|
|
virtual void OnError();
|
|
virtual void OnSignalingMessage(const std::string& msg);
|
|
|
|
// Called when a local stream is added and initialized
|
|
virtual void OnLocalStreamInitialized(const std::string& stream_id,
|
|
bool video);
|
|
|
|
// Called when a remote stream is added
|
|
virtual void OnAddStream(const std::string& stream_id, bool video);
|
|
|
|
virtual void OnRemoveStream(const std::string& stream_id,
|
|
bool video);
|
|
|
|
//
|
|
// PeerConnectionClientObserver implementation.
|
|
//
|
|
|
|
virtual void OnSignedIn();
|
|
|
|
virtual void OnDisconnected();
|
|
|
|
virtual void OnPeerConnected(int id, const std::string& name);
|
|
|
|
virtual void OnPeerDisconnected(int id);
|
|
|
|
virtual void OnMessageFromPeer(int peer_id, const std::string& message);
|
|
|
|
virtual void OnMessageSent(int err);
|
|
|
|
//
|
|
// MainWndCallback implementation.
|
|
//
|
|
|
|
virtual bool StartLogin(const std::string& server, int port);
|
|
|
|
virtual void DisconnectFromServer();
|
|
|
|
virtual void ConnectToPeer(int peer_id);
|
|
|
|
virtual void DisconnectFromCurrentPeer();
|
|
|
|
virtual void UIThreadCallback(int msg_id, void* data);
|
|
|
|
protected:
|
|
bool waiting_for_audio_;
|
|
bool waiting_for_video_;
|
|
int peer_id_;
|
|
talk_base::scoped_ptr<webrtc::PeerConnection> peer_connection_;
|
|
talk_base::scoped_ptr<webrtc::PeerConnectionFactory> peer_connection_factory_;
|
|
talk_base::scoped_ptr<talk_base::Thread> worker_thread_;
|
|
PeerConnectionClient* client_;
|
|
MainWindow* main_wnd_;
|
|
std::string video_channel_;
|
|
std::string audio_channel_;
|
|
std::deque<std::string*> pending_messages_;
|
|
};
|
|
|
|
#endif // PEERCONNECTION_SAMPLES_CLIENT_CONDUCTOR_H_
|