Commit 16db8ca2 authored by Stepan Salenikovich's avatar Stepan Salenikovich Committed by gerrit2

remove videowindow source files

Since they are no longer used to create the fullscreen.

Change-Id: I010663458a80fb94b80555206ea159f133f19a9c
Tuleap: #161
parent 5e431cf1
......@@ -228,8 +228,6 @@ SET( SRC_FILES
src/utils/calling.cpp
src/ringnotify.h
src/ringnotify.cpp
src/video/videowindow.h
src/video/videowindow.cpp
src/utils/files.h
src/utils/files.cpp
${GIT_REVISION_OUTPUT_FILE}
......
......@@ -44,7 +44,6 @@
#include <media/text.h>
#include <media/textrecording.h>
#include "models/gtkqtreemodel.h"
#include "video/videowindow.h"
#include "ringnotify.h"
#include <audio/codecmodel.h>
#include <account.h>
......
/*
* Copyright (C) 2015 Savoir-Faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#include "videowindow.h"
#include <gtk/gtk.h>
#include <call.h>
#include "video_widget.h"
#include <video/previewmanager.h>
struct _VideoWindow
{
GtkWindow parent;
};
struct _VideoWindowClass
{
GtkWindowClass parent_class;
};
typedef struct _VideoWindowPrivate VideoWindowPrivate;
struct _VideoWindowPrivate
{
GtkWidget *video_widget;
QMetaObject::Connection local_renderer_connection;
QMetaObject::Connection remote_renderer_connection;
};
G_DEFINE_TYPE_WITH_PRIVATE(VideoWindow, video_window, GTK_TYPE_WINDOW);
#define VIDEO_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), VIDEO_WINDOW_TYPE, VideoWindowPrivate))
static void
video_window_dispose(GObject *object)
{
VideoWindow *self;
VideoWindowPrivate *priv;
self = VIDEO_WINDOW(object);
priv = VIDEO_WINDOW_GET_PRIVATE(self);
QObject::disconnect(priv->local_renderer_connection);
QObject::disconnect(priv->remote_renderer_connection);
G_OBJECT_CLASS(video_window_parent_class)->dispose(object);
}
static gboolean
handle_keys(GtkWidget *self, GdkEventKey *event, G_GNUC_UNUSED gpointer user_data)
{
if (event->keyval == GDK_KEY_Escape) {
gtk_widget_destroy(self);
/* the event has been fully handled */
return TRUE;
}
return FALSE;
}
static gboolean
handle_button_press(GtkWidget *widget, GdkEventButton *event, VideoWindow *self)
{
g_return_val_if_fail(IS_VIDEO_WIDGET(widget), FALSE);
g_return_val_if_fail(IS_VIDEO_WINDOW(self), FALSE);
/* on double click */
if (event->type == GDK_2BUTTON_PRESS) {
gtk_widget_destroy(GTK_WIDGET(self));
/* the event has been fully handled */
return TRUE;
}
return FALSE;
}
static void
video_window_init(VideoWindow *self)
{
VideoWindowPrivate *priv = VIDEO_WINDOW_GET_PRIVATE(self);
gtk_window_set_decorated(GTK_WINDOW(self), FALSE);
/* video widget */
priv->video_widget = video_widget_new();
gtk_container_add(GTK_CONTAINER(self), priv->video_widget);
gtk_widget_show_all(priv->video_widget);
/* catch double click to exot full screen */
g_signal_connect(priv->video_widget, "button-press-event",
G_CALLBACK(handle_button_press),
self);
/* catch esc to exit fullscreen */
g_signal_connect(self, "key_press_event", G_CALLBACK(handle_keys), NULL);
}
static void
video_window_class_init(VideoWindowClass *klass)
{
G_OBJECT_CLASS(klass)->dispose = video_window_dispose;
}
GtkWidget *
video_window_new(Call *call, GtkWindow *parent)
{
GtkWidget *self = (GtkWidget *)g_object_new(VIDEO_WINDOW_TYPE, NULL);
VideoWindowPrivate *priv = VIDEO_WINDOW_GET_PRIVATE(self);
if (parent)
gtk_window_set_transient_for(GTK_WINDOW(self), parent);
/* check if we already have a renderer */
video_widget_push_new_renderer(VIDEO_WIDGET(priv->video_widget),
call->videoRenderer(),
VIDEO_RENDERER_REMOTE);
/* callback for remote renderer */
priv->remote_renderer_connection = QObject::connect(
call,
&Call::videoStarted,
[=](Video::Renderer *renderer) {
video_widget_push_new_renderer(VIDEO_WIDGET(priv->video_widget),
renderer,
VIDEO_RENDERER_REMOTE);
}
);
/* local renderer */
if (Video::PreviewManager::instance().isPreviewing())
video_widget_push_new_renderer(VIDEO_WIDGET(priv->video_widget),
Video::PreviewManager::instance().previewRenderer(),
VIDEO_RENDERER_LOCAL);
/* callback for local renderer */
priv->local_renderer_connection = QObject::connect(
&Video::PreviewManager::instance(),
&Video::PreviewManager::previewStarted,
[=](Video::Renderer *renderer) {
video_widget_push_new_renderer(VIDEO_WIDGET(priv->video_widget),
renderer,
VIDEO_RENDERER_LOCAL);
}
);
return self;
}
/*
* Copyright (C) 2015 Savoir-Faire Linux Inc.
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef _VIDEOWINDOW_H
#define _VIDEOWINDOW_H
#include <gtk/gtk.h>
class Call;
G_BEGIN_DECLS
#define VIDEO_WINDOW_TYPE (video_window_get_type ())
#define VIDEO_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIDEO_WINDOW_TYPE, VideoWindow))
#define VIDEO_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIDEO_WINDOW_TYPE, VideoWindowClass))
#define IS_VIDEO_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIDEO_WINDOW_TYPE))
#define IS_VIDEO_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIDEO_WINDOW_TYPE))
typedef struct _VideoWindow VideoWindow;
typedef struct _VideoWindowClass VideoWindowClass;
GType video_window_get_type (void) G_GNUC_CONST;
GtkWidget *video_window_new (Call *call, GtkWindow *parent);
G_END_DECLS
#endif /* _VIDEOWINDOW_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment