Skip to content

Commit fcf25d1

Browse files
filnetf5soh
authored andcommitted
Merged in filnet/librepilot/misc_fixes (pull request #484)
Misc fixes Approved-by: Lalanne Laurent <f5soh@free.fr> Approved-by: Philippe Renon <philippe_renon@yahoo.fr> Approved-by: Paul Jewell <paul@teulu.org>
2 parents 371760d + 1a3fb1f commit fcf25d1

11 files changed

Lines changed: 6 additions & 444 deletions

File tree

ground/gcs/src/libs/utils/utils.pro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ HEADERS += \
5050
basevalidatinglineedit.h \
5151
linecolumnlabel.h \
5252
qtcolorbutton.h \
53-
abstractprocess.h \
54-
consoleprocess.h \
5553
synchronousprocess.h \
5654
treewidgetcolumnstretcher.h \
5755
checkablemessagebox.h \

ground/gcs/src/plugins/gcscontrol/gcsonctrolgadgetwidget.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

ground/gcs/src/share/configurations/default_linux.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<displayVideo>true</displayVideo>
5656
<pipelineDesc>ximagesrc ! tee name=t
5757
t. ! queue ! timeoverlay ! autovideosink
58-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
58+
t. ! queue ! videoconvert ! x264enc tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
5959
<pipelineInfo></pipelineInfo>
6060
<respectAspectRatio>true</respectAspectRatio>
6161
</data>
@@ -101,7 +101,7 @@
101101
<displayVideo>true</displayVideo>
102102
<pipelineDesc>v4l2src ! tee name=t
103103
t. ! queue ! timeoverlay ! autovideosink
104-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
104+
t. ! queue ! videoconvert ! x264enc tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
105105
<pipelineInfo></pipelineInfo>
106106
<respectAspectRatio>true</respectAspectRatio>
107107
</data>

ground/gcs/src/share/configurations/default_macos.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<displayVideo>true</displayVideo>
5656
<pipelineDesc>avfvideosrc capture-screen=true capture-screen-cursor=true ! tee name=t
5757
t. ! queue ! timeoverlay ! autovideosink
58-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
58+
t. ! queue ! videoconvert ! x264enc tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
5959
<pipelineInfo></pipelineInfo>
6060
<respectAspectRatio>true</respectAspectRatio>
6161
</data>
@@ -101,7 +101,7 @@
101101
<displayVideo>true</displayVideo>
102102
<pipelineDesc>avfvideosrc ! tee name=t
103103
t. ! queue ! timeoverlay ! autovideosink
104-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
104+
t. ! queue ! videoconvert ! x264enc tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
105105
<pipelineInfo></pipelineInfo>
106106
<respectAspectRatio>true</respectAspectRatio>
107107
</data>

ground/gcs/src/share/configurations/default_windows.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<displayVideo>true</displayVideo>
5656
<pipelineDesc>dx9screencapsrc monitor=0 cursor=true ! tee name=t
5757
t. ! queue ! timeoverlay ! autovideosink
58-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
58+
t. ! queue ! videoconvert ! x264enc tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
5959
<pipelineInfo></pipelineInfo>
6060
<respectAspectRatio>true</respectAspectRatio>
6161
</data>
@@ -115,7 +115,7 @@
115115
<displayVideo>true</displayVideo>
116116
<pipelineDesc>ksvideosrc device-index=0 ! tee name=t
117117
t. ! queue ! timeoverlay ! autovideosink
118-
t. ! queue ! videoconvert ! x264enc tune=zerolatency tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
118+
t. ! queue ! videoconvert ! x264enc tune=zerolatency bitrate=498 ! mpegpsmux ! filesink location=capture.mpg</pipelineDesc>
119119
<pipelineInfo></pipelineInfo>
120120
<respectAspectRatio>true</respectAspectRatio>
121121
</data>

make/winx86/README.txt

Lines changed: 0 additions & 200 deletions
This file was deleted.

make/winx86/bin/install

Lines changed: 0 additions & 15 deletions
This file was deleted.

make/winx86/bin/make

Lines changed: 0 additions & 15 deletions
This file was deleted.

make/winx86/cmd/make.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)