First version of the peerconnection client application for Linux.
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
This commit is contained in:
@@ -12,6 +12,9 @@
|
||||
#ifndef PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
|
||||
#define PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
|
||||
|
||||
#include "peerconnection/samples/client/main_wnd.h"
|
||||
#include "peerconnection/samples/client/peer_connection_client.h"
|
||||
|
||||
// Forward declarations.
|
||||
typedef struct _GtkWidget GtkWidget;
|
||||
typedef union _GdkEvent GdkEvent;
|
||||
@@ -23,11 +26,23 @@ typedef struct _GtkTreeViewColumn GtkTreeViewColumn;
|
||||
// Implements the main UI of the peer connection client.
|
||||
// This is functionally equivalent to the MainWnd class in the Windows
|
||||
// implementation.
|
||||
class GtkMainWnd {
|
||||
class GtkMainWnd : public MainWindow {
|
||||
public:
|
||||
GtkMainWnd();
|
||||
~GtkMainWnd();
|
||||
|
||||
virtual void RegisterObserver(MainWndCallback* callback);
|
||||
virtual bool IsWindow();
|
||||
virtual void SwitchToConnectUI();
|
||||
virtual void SwitchToPeerList(const Peers& peers);
|
||||
virtual void SwitchToStreamingUI();
|
||||
virtual void MessageBox(const char* caption, const char* text,
|
||||
bool is_error);
|
||||
virtual MainWindow::UI current_ui();
|
||||
virtual cricket::VideoRenderer* local_renderer();
|
||||
virtual cricket::VideoRenderer* remote_renderer();
|
||||
virtual void QueueUIThreadCallback(int msg_id, void* data);
|
||||
|
||||
// Creates and shows the main window with the |Connect UI| enabled.
|
||||
bool Create();
|
||||
|
||||
@@ -35,9 +50,6 @@ class GtkMainWnd {
|
||||
// main message loop.
|
||||
bool Destroy();
|
||||
|
||||
// Returns true iff the main window exists.
|
||||
bool IsWindow();
|
||||
|
||||
// Callback for when the main window is destroyed.
|
||||
void OnDestroyed(GtkWidget* widget, GdkEvent* event);
|
||||
|
||||
@@ -51,22 +63,52 @@ class GtkMainWnd {
|
||||
// connection.
|
||||
void OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path,
|
||||
GtkTreeViewColumn* column);
|
||||
|
||||
void OnRedraw();
|
||||
|
||||
protected:
|
||||
// Switches to the Connect UI. The Connect UI must not already be active.
|
||||
void SwitchToConnectUI();
|
||||
class VideoRenderer : public cricket::VideoRenderer {
|
||||
public:
|
||||
VideoRenderer(GtkMainWnd* main_wnd);
|
||||
virtual ~VideoRenderer();
|
||||
|
||||
// Switches to a list view that shows a list of currently connected peers.
|
||||
// TODO(tommi): Support providing a peer list.
|
||||
void SwitchToPeerList(/*const Peers& peers*/);
|
||||
virtual bool SetSize(int width, int height, int reserved);
|
||||
|
||||
// Switches to the video streaming UI.
|
||||
void SwitchToStreamingUI();
|
||||
virtual bool RenderFrame(const cricket::VideoFrame* frame);
|
||||
|
||||
const uint8* image() const {
|
||||
return image_.get();
|
||||
}
|
||||
|
||||
int width() const {
|
||||
return width_;
|
||||
}
|
||||
|
||||
int height() const {
|
||||
return height_;
|
||||
}
|
||||
|
||||
protected:
|
||||
talk_base::scoped_array<uint8> image_;
|
||||
int width_;
|
||||
int height_;
|
||||
GtkMainWnd* main_wnd_;
|
||||
};
|
||||
|
||||
protected:
|
||||
GtkWidget* window_; // Our main window.
|
||||
GtkWidget* draw_area_; // The drawing surface for rendering video streams.
|
||||
GtkWidget* vbox_; // Container for the Connect UI.
|
||||
GtkWidget* server_edit_;
|
||||
GtkWidget* port_edit_;
|
||||
GtkWidget* peer_list_; // The list of peers.
|
||||
MainWndCallback* callback_;
|
||||
std::string server_;
|
||||
std::string port_;
|
||||
talk_base::scoped_ptr<VideoRenderer> local_renderer_;
|
||||
talk_base::scoped_ptr<VideoRenderer> remote_renderer_;
|
||||
talk_base::scoped_ptr<uint8> draw_buffer_;
|
||||
int draw_buffer_size_;
|
||||
};
|
||||
|
||||
#endif // PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
|
||||
|
||||
Reference in New Issue
Block a user