commit 637a1795459a1c9b308d1ea1269a53214da3cca6
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 8 20:04:31 2022 +0200
Moved encoder signal to side of results table. Deleted all old encoder video frame (previous to ffmpeg).
glade/app1.glade | 702 +++++++++++-------------------------------------
src/gui/app1/encoder.cs | 122 +--------
src/gui/networks.cs | 5 -
src/gui/webcam.cs | 27 --
4 files changed, 163 insertions(+), 693 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index d1a46a51c..f28d4e23e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -32977,11 +32977,6 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHPaned" id="hpaned_encoder">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">400</property>
- <child>
<widget class="GtkVBox"
id="vbox_encoder_bars_table_and_save_reps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -33089,6 +33084,11 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkHPaned" id="hpaned1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">600</property>
+ <child>
<widget class="GtkAlignment"
id="alignment_treeview_encoder_capture_curves">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -33157,6 +33157,155 @@ Concentric</property>
</child>
</widget>
<packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment"
id="alignment_encoder_capture_signal">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">4</property>
+ <child>
+ <widget class="GtkVBox" id="vbox73">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox156">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">4</property>
+ <property name="label"
translatable="yes">Set</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</property>
+ <child>
+ <widget class="GtkVBox" id="vbox153">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkHBox" id="hbox531">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkDrawingArea"
id="encoder_capture_signal_drawingarea_cairo">
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <signal name="expose_event"
handler="on_encoder_capture_signal_drawingarea_cairo_expose_event" swapped="no"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">capture</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow11">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkViewport"
id="viewport_image_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resize_mode">queue</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label115">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">repetitions</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="resize">True</property>
<property name="shrink">False</property>
</packing>
@@ -33172,6 +33321,7 @@ Concentric</property>
<widget class="GtkHBox"
id="hbox_encoder_capture_save_repetitions">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkLabel" id="label77">
<property name="visible">True</property>
@@ -33299,127 +33449,9 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVPaned"
id="vpaned_encoder_capture_video_and_set_graph">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">200</property>
- <child>
- <widget class="GtkAlignment"
id="alignment_video_encoder">
- <property name="width_request">275</property>
- <property name="can_focus">False</property>
- <property name="border_width">4</property>
- <child>
- <widget class="GtkVBox" id="vbox14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox94">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkHBox" id="hbox146">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_video_encoder_capture">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Record</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-media-record</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_video_encoder_play">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Play</property>
- <property name="draw_indicator">False</property>
- <property
name="group">radiobutton_video_encoder_capture</property>
- <child>
- <widget class="GtkImage"
id="image_video_encoder_play">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_video_encoder_options">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Options</property>
- <property name="draw_indicator">False</property>
- <property
name="group">radiobutton_video_encoder_capture</property>
- <child>
- <widget class="GtkImage" id="image56">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-properties</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label124">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Video</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -33430,430 +33462,6 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook"
id="notebook_video_encoder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <property name="tab_border">0</property>
- <property name="tab_hborder">0</property>
- <property name="tab_vborder">0</property>
- <child>
- <widget class="GtkVBox" id="vbox59">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="extension_events">cursor</property>
- <property name="border_width">2</property>
- <child>
- <widget class="GtkHBox" id="hbox118">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkCheckButton"
id="checkbutton_video_encoder_old">
- <property name="label" translatable="yes">Record
video on capture</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Record video (on / off)</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_video_encoder_feedback_old">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkViewport"
id="viewport_video_capture_encoder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label125">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="yalign">0.46000000834465027</property>
- <property name="label">capture</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkViewport"
id="viewport_video_play_encoder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label126">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">play</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox149">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkVBox" id="vbox96">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label133">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Filename</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label134">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Folder</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox97">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel"
id="label_video_encoder_filename">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTextView"
id="textview_video_encoder_folder">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox150">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_video_encoder_open_folder">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Open
Folder</property>
- <signal name="clicked"
handler="on_button_video_encoder_open_folder_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_encoder_capture_open2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label127">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">options</property>
- </widget>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="left_padding">4</property>
- <child>
- <widget class="GtkVBox" id="vbox73">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox156">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">4</property>
- <property name="label"
translatable="yes">Set</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment25">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">4</property>
- <child>
- <widget class="GtkVBox" id="vbox153">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHBox" id="hbox531">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkNotebook"
id="notebook_encoder_capture">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
- <widget class="GtkDrawingArea"
id="encoder_capture_signal_drawingarea_cairo">
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <signal name="expose_event"
handler="on_encoder_capture_signal_drawingarea_cairo_expose_event" swapped="no"/>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_encoder_capture">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">capture</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow11">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="vscrollbar_policy">automatic</property>
- <child>
- <widget class="GtkViewport"
id="viewport_image_encoder_capture">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="resize_mode">queue</property>
- <child>
- <widget class="GtkImage"
id="image_encoder_capture">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label115">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">repetitions</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- </widget>
- <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 7cf5480d5..56fdcac14 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -76,7 +76,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Box hbox_encoder_configuration;
[Widget] Gtk.Frame frame_encoder_capture_options;
[Widget] Gtk.HBox hbox_encoder_capture_actions;
- [Widget] Gtk.HPaned hpaned_encoder;
[Widget] Gtk.VBox vbox_inertial_instructions;
[Widget] Gtk.Box hbox_encoder_capture_wait;
@@ -120,7 +119,7 @@ public partial class ChronoJumpWindow
// [Widget] Gtk.Button button_menu_encoder_export_set;
[Widget] Gtk.Button button_encoder_delete_signal;
- [Widget] Gtk.VPaned vpaned_encoder_capture_video_and_set_graph;
+ [Widget] Gtk.Alignment alignment_encoder_capture_signal;
[Widget] Gtk.Button button_activate_chronopics_encoder;
//[Widget] Gtk.Button button_activate_chronopics_encoder_networks_problems;
@@ -504,10 +503,6 @@ public partial class ChronoJumpWindow
captureCurvesBarsData = new ArrayList(0);
-
- if(UtilAll.GetOSEnum() != UtilAll.OperatingSystems.LINUX)
- playVideoEncoderInitialSetup();
-
LogB.Information("after play 0");
capturingCsharp = encoderCaptureProcess.STOPPED;
LogB.Information("after play 1");
@@ -835,13 +830,13 @@ public partial class ChronoJumpWindow
label_wait.Text = " ";
label_calibrate_output_message.Text = "";
- hpaned_encoder.Visible = false;
+ vbox_encoder_bars_table_and_save_reps.Visible = false;
vbox_inertial_instructions.Visible = true;
}
private void on_button_encoder_inertial_calibrate_close_clicked (object o, EventArgs args)
{
- hpaned_encoder.Visible = true;
+ vbox_encoder_bars_table_and_save_reps.Visible = true;
vbox_inertial_instructions.Visible = false;
sensitiveGuiEventDone();
@@ -1366,7 +1361,7 @@ public partial class ChronoJumpWindow
alignment_encoder_capture_curves_bars_drawingarea.Visible = check_encoder_capture_bars.Active;
alignment_treeview_encoder_capture_curves.Visible = check_encoder_capture_table.Active;
- vpaned_encoder_capture_video_and_set_graph.Visible = check_encoder_capture_signal.Active;
+ alignment_encoder_capture_signal.Visible = check_encoder_capture_signal.Active;
hbox_encoder_capture_save_repetitions.Visible =
(check_encoder_capture_bars.Active || check_encoder_capture_table.Active);
@@ -5273,7 +5268,7 @@ public partial class ChronoJumpWindow
frame_persons.Sensitive = ! show;
hbox_encoder_configuration.Sensitive = ! show;
hbox_encoder_capture_top.Sensitive = ! show;
- vpaned_encoder_capture_video_and_set_graph.Sensitive = ! show;
+ alignment_encoder_capture_signal.Sensitive = ! show;
button_encoder_inertial_recalibrate.Sensitive = ! show;
hbox_top_person.Sensitive = ! show;
hbox_top_person_encoder.Sensitive = ! show;
@@ -5853,7 +5848,7 @@ public partial class ChronoJumpWindow
frame_encoder_capture_options.Sensitive = s;
hbox_encoder_capture_actions.Sensitive = s;
hbox_video_encoder.Sensitive = s;
- hpaned_encoder.Sensitive = s;
+ vbox_encoder_bars_table_and_save_reps.Sensitive = s;
}
/* end of sensitivity stuff */
@@ -6626,9 +6621,9 @@ public partial class ChronoJumpWindow
//TODO: test this if this is needed:
//if on inertia and already showing instructions, hide them
- if(hpaned_encoder.Visible == false)
+ if(vbox_encoder_bars_table_and_save_reps.Visible == false)
{
- hpaned_encoder.Visible = true;
+ vbox_encoder_bars_table_and_save_reps.Visible = true;
vbox_inertial_instructions.Visible = false;
}
@@ -7403,8 +7398,6 @@ public partial class ChronoJumpWindow
Sqlite.Close();
}
-
- playVideoEncoderPrepare(false); //do not play
}
if(action == encoderActions.CAPTURE_IM && ! encoderProcessCancel && !
encoderProcessProblems)
@@ -7790,105 +7783,6 @@ public partial class ChronoJumpWindow
/* end of thread stuff */
-
- /* video stuff */
-
- private void encoderStartVideoRecord() {
- /*
- * TODO: reimplement this with ffmpeg
- *
- LogB.Information("Starting video if selected on preferences");
- checkbutton_video_encoder.Sensitive = false;
- if(preferences.videoOn) {
- capturer.ClickRec();
- label_video_feedback_encoder.Text = "Rec.";
- }
- //viewport_video_capture_encoder.Sensitive = false;
- //*/
- }
-
- private void encoderStopVideoRecord() {
- /*
- * TODO: reimplement this with ffmpeg
- *
- LogB.Information("Stopping video");
- checkbutton_video_encoder.Sensitive = true;
- if(preferences.videoOn) {
- label_video_feedback_encoder.Text = "";
- capturer.ClickStop();
- videoCapturePrepare(false); //if error, show message
- }
- */
- }
-
- //static PlayerBin playerEncoder;
- private void playVideoEncoderInitialSetup() //this does not work on raspberry
- {
- /*
- * TODO: reimplement this with ffmpeg
- *
- //TODO: use a try specific … study this further
- LogB.Information("Prepare video encoder 0");
-
- try {
- playerEncoder = new PlayerBin();
- LogB.Information("Prepare video encoder 1");
- viewport_video_play_encoder.Add(playerEncoder);
- LogB.Information("Prepare video encoder 2");
- playerEncoder.SeeControlsBox(true);
- LogB.Information("Prepare video encoder 3");
- } catch {
- LogB.Information("Catched on playVideoEncoderInitialSetup");
- //it crashes on Raspberry, Banana, (and since 2018 on Linux (Debian))
- }
- LogB.Information("Prepare video encoder 4");
- */
- }
-
- void playVideoEncoderPrepare(bool play)
- {
- /*
- * TODO: reimplement this with ffmpeg
- *
- LogB.Information("playVideoEncoderDo", play.ToString());
- string file = Util.GetVideoFileName(currentSession.UniqueID,
- Constants.TestTypes.ENCODER, Convert.ToInt32(encoderSignalUniqueID));
-
- if(playerEncoder == null) //useful for raspberry because this is not initialized
- return;
-
- if(file == null || file == "" || ! File.Exists(file)) {
- playerEncoder.Hide();
- return;
- }
-
- try {
- playerEncoder.Show();
- playerEncoder.Open(file);
- if(play)
- playerEncoder.Play();
- } catch {
- new DialogMessage(Constants.MessageTypes.WARNING,
- Catalog.GetString("Sorry, file not found"));
- }
- */
- }
-
- public void on_button_video_encoder_open_folder_clicked (object obj, EventArgs args) {
- /*
- string dir = textview_video_encoder_folder.Buffer.Text;
- try {
- System.Diagnostics.Process.Start(dir); //also use Util.OpenFolder
- }
- catch {
- new DialogMessage(Constants.MessageTypes.WARNING,
- Constants.DirectoryCannotOpen + "\n\n" + dir);
- }
- */
- }
-
- /* end of video stuff */
-
}
public class EncoderCaptureDisplay : BooleansInt
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 5bf8a2256..8426fbb48 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -494,11 +494,6 @@ public partial class ChronoJumpWindow
hbox_encoder_analyze_signal_or_curves.HeightRequest = 40;
button_encoder_analyze.SetSizeRequest(120,40);
}
- /*
- if(! configChronojump.UseVideo) {
- alignment_video_encoder.Visible = false;
- }
- */
//restriction for configured Compujump clients
//if(configChronojump.Compujump)
// hbox_encoder_im_weights_n.Sensitive = false;
diff --git a/src/gui/webcam.cs b/src/gui/webcam.cs
index 9578f7cfd..099bfb997 100644
--- a/src/gui/webcam.cs
+++ b/src/gui/webcam.cs
@@ -506,33 +506,6 @@ public partial class ChronoJumpWindow
checkbutton_video_contacts.Active = false;
}
- if(notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.CONTACTS)) {
- /*
- * TODO:
- //remove video capture from encoder tab
- viewport_video_capture_encoder.Remove(capturer);
- //add in contacts tab
- hbox_video_capture.PackStart(capturer, true, true, 0);
- */
- } else {
- /*
- * TODO:
- //remove video capture from contacts tab
- hbox_video_capture.Remove(capturer);
- //add in encoder tab
-
- //switch to capture tab
- radiobutton_video_encoder_capture.Active = true;
-
- //sometimes it seems is not removed and then cannot be added again
- //just add if not exists
- //maybe this error was because before we were not doing the:
- //radiobutton_video_encoder_capture.Active = true;
- if(viewport_video_capture_encoder.Child == null)
- viewport_video_capture_encoder.Add(capturer);
- */
- }
-
if(wasActive)
checkbutton_video_contacts.Active = true;