Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-gnome
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-gnome
Commits
e69dbf02
Commit
e69dbf02
authored
5 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
video_widget: switch video input on current remote id
Change-Id: Ic36850b211748117e510e13ce2293a03117711f5
parent
d2a279eb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/video/video_widget.cpp
+4
-4
4 additions, 4 deletions
src/video/video_widget.cpp
with
4 additions
and
4 deletions
src/video/video_widget.cpp
+
4
−
4
View file @
e69dbf02
...
@@ -417,7 +417,7 @@ switch_video_input(GtkWidget *widget, GtkWidget *parent)
...
@@ -417,7 +417,7 @@ switch_video_input(GtkWidget *widget, GtkWidget *parent)
g_warning
(
"switch_video_input couldn't find device: %s"
,
label
);
g_warning
(
"switch_video_input couldn't find device: %s"
,
label
);
return
;
return
;
}
}
priv
->
avModel_
->
switchInputTo
(
device_id
);
priv
->
avModel_
->
switchInputTo
(
device_id
,
priv
->
remote
->
v_renderer
->
getId
()
);
}
}
}
}
...
@@ -452,7 +452,7 @@ switch_video_input_screen_area(G_GNUC_UNUSED GtkWidget *item, GtkWidget *parent)
...
@@ -452,7 +452,7 @@ switch_video_input_screen_area(G_GNUC_UNUSED GtkWidget *item, GtkWidget *parent)
}
}
if
(
priv
->
avModel_
)
if
(
priv
->
avModel_
)
priv
->
avModel_
->
setDisplay
(
display
,
x
,
y
,
width
,
height
);
priv
->
avModel_
->
setDisplay
(
display
,
x
,
y
,
width
,
height
,
priv
->
remote
->
v_renderer
->
getId
()
);
}
}
static
void
static
void
...
@@ -480,7 +480,7 @@ switch_video_input_monitor(G_GNUC_UNUSED GtkWidget *item, GtkWidget *parent)
...
@@ -480,7 +480,7 @@ switch_video_input_monitor(G_GNUC_UNUSED GtkWidget *item, GtkWidget *parent)
height
=
gdk_screen_height
();
height
=
gdk_screen_height
();
if
(
priv
->
avModel_
)
if
(
priv
->
avModel_
)
priv
->
avModel_
->
setDisplay
(
display
,
x
,
y
,
width
,
height
);
priv
->
avModel_
->
setDisplay
(
display
,
x
,
y
,
width
,
height
,
priv
->
remote
->
v_renderer
->
getId
()
);
}
}
...
@@ -505,7 +505,7 @@ switch_video_input_file(G_GNUC_UNUSED GtkWidget *item, GtkWidget *parent)
...
@@ -505,7 +505,7 @@ switch_video_input_file(G_GNUC_UNUSED GtkWidget *item, GtkWidget *parent)
gchar
*
uri
=
gtk_file_chooser_get_uri
(
GTK_FILE_CHOOSER
(
dialog
));
gchar
*
uri
=
gtk_file_chooser_get_uri
(
GTK_FILE_CHOOSER
(
dialog
));
if
(
uri
&&
priv
->
avModel_
)
{
if
(
uri
&&
priv
->
avModel_
)
{
priv
->
avModel_
->
setInputFile
(
uri
);
priv
->
avModel_
->
setInputFile
(
uri
,
priv
->
remote
->
v_renderer
->
getId
()
);
g_free
(
uri
);
g_free
(
uri
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment