Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@in-league-with-satan
in-league-with-satan committed Aug 23, 2020
2 parents ab8ee0e + 15fa894 commit c960997
Show file tree
Hide file tree
Showing 207 changed files with 3,478 additions and 1,204 deletions.
6 changes: 3 additions & 3 deletions android_ctrl/capturer_ctrl.pri
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ QML_DESIGNER_IMPORT_PATH =
# any feature of Qt which as been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS
#DEFINES += QT_DEPRECATED_WARNINGS

# You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0

## Default rules for deployment.
#qnx: target.path = /tmp/$${TARGET}/bin
#else: unix:!android: target.path = /opt/$${TARGET}/bin
#!isEmpty(target.path): INSTALLS += target


CONFIG += c++14
CONFIG += c++17

!android {
DESTDIR = $$PWD/../bin
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/qml/AdditionalControl.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/qml/BaseControl.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/qml/Button2.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/qml/ButtonRec.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/qml/Player.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
16 changes: 8 additions & 8 deletions android_ctrl/qml/PlayerState.qml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/******************************************************************************
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.com>
Copyright © 2018, 2020 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down Expand Up @@ -98,7 +98,7 @@ Rectangle {
Connections {
target: messenger

onPlayerDurationChanged: root.duration=value
onPlayerPositionChanged: root.position=value
function onPlayerDurationChanged(value) { root.duration=value }
function onPlayerPositionChanged(value) { root.position=value }
}
}
10 changes: 5 additions & 5 deletions android_ctrl/qml/SetupForm.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/qml/main_android.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions android_ctrl/qml/main_win.qml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/******************************************************************************
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.com>
Copyright © 2018, 2020 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand All @@ -21,7 +21,6 @@ import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Controls 1.5
import QtQuick.Layouts 1.3
//import QtQuick.Particles 2.0
import QtGraphicalEffects 1.0

import FuckTheSystem 0.0
Expand Down Expand Up @@ -106,7 +105,7 @@ ApplicationWindow {
Connections {
target: setup_form

onBack: {
function onBack() {
setup_form.visible=false
swipe_view.visible=true
swipe_pos_indicator.visible=true
Expand All @@ -116,11 +115,11 @@ ApplicationWindow {
Connections {
target: messenger

onUpdateRecStats: {
function onUpdateRecStats(duration, size, free_space, bitrate, frames_dropped, frame_buffer_state) {
button_rec.setText("duration: " + duration + "\n" + "size: " + size + "\n" + "free space: " + free_space + "\n" + "bitrate: " + bitrate + "\n" + "buffer state: " + frame_buffer_state + "\n" + "frames dropped: " + frames_dropped)
}

onRecStateChanged: {
function onRecStateChanged(state) {
if(state)
button_rec.recStarted()

Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/src/keep_screen_on.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/src/keep_screen_on.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/src/network/http_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions android_ctrl/src/network/http_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Copyright © 2018 Andrey Cheprasov <ae.cheprasov@gmail.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.
it under the terms of the GNU Affero 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.
GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/
Expand Down
Loading

0 comments on commit c960997

Please sign in to comment.