|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/harbour-clipper.git</param>
<param name="branch">main</param>
- <param name="revision">0.4.0</param>
+ <param name="revision">0.4.1</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/ffmpeg/arm32/ffmpeg_static
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/ffmpeg/arm64/ffmpeg_static
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/ffmpeg/x86_32/ffmpeg_static
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/colgate.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/glitch0r.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/glow.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/lenscorrection.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/pixeliz0r.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/posterize.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm32/vertigo.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/colgate.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/glitch0r.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/glow.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/lenscorrection.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/pixeliz0r.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/posterize.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/arm64/vertigo.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/colgate.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/glitch0r.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/glow.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/lenscorrection.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/pixeliz0r.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/posterize.so
^
|
|
|
Deleted |
_service:tar_git:harbour-clipper-0.4.0.tar.bz2/lib/frei0r/x86_32/vertigo.so
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.1.tar.bz2/qml/pages/FirstPage.qml
^
|
| @@ -19,7 +19,7 @@
}
// file and folder variables
- property bool debug: true
+ property bool debug: false
property string origMediaFilePath
property string origMediaFileName : "none"
property string origMediaFolderPath
@@ -40,9 +40,7 @@
property var origDAR : "0:0"
property string homeDirectory
property string tempMediaFolderPath: StandardPaths.home + '/.cache/de.poetaster/harbour-clipper'
- //property string tempMediaFolderPath: '/home/defaultuser/.cache/de.poetaster/harbour-clipper'
property string tempMediaType : "mkv"
- //property string ffmpeg_staticPath : "//usr" + "/share" + "/harbour-clipper" + "/lib" + /ffmpeg/ + "./ffmpeg_static" // -> needed since SF included version does not provide some codecs and filters
property string ffmpeg_staticPath : "/usr/bin/ffmpeg"
property string overlaysFolder : "/usr" + "/share" + "/harbour-clipper" + "/qml" + "/overlays/"
property string filterFolder : "/usr" + "/share" + "/harbour-clipper" + "/qml" + "/filters/"
@@ -600,8 +598,10 @@
AudioRecorder {
id: audioRecorder_Sample //(( audioRecorder_Sample.recording ) ? audioRecorder_Sample.stop() : audioRecorder_Sample.record() )
onRecordingChanged: {
- //console.log("recording changed")
+ console.log("recording changed")
+
}
+
}
/*
@@ -2504,15 +2504,24 @@
onEntered: {
startRecordingHandlePosX = idSliderHandle1.x + idSliderHandle1.width/2
idMediaPlayer.pause() // in case it did not pause yet
- recordingBeepStart.play()
- idTimerDelayRecording.start() // records, commands are issued when beep sound has finished
+
+ // this makes no sense since we have to mute to record
+ //recordingBeepStart.play()
+ //idTimerDelayRecording.start() // records, commands are issued when beep sound has finished
+
+ recordingOverlayStart = (idMediaPlayer.position/1000).toString()
+ recordingAudioState = true
+ audioRecorder_Sample.record()
+ idMediaPlayer.play()
+ thumbnailVisible = false
}
onReleased: {
audioRecorder_Sample.stop()
recordingAudioState = false
idMediaPlayer.pause()
//thumbnailVisible = false
- recordingBeepStop.play()
+ // this makes no sense since we have to mute to record
+ //recordingBeepStop.play()
py.recordAudioFunction()
}
}
@@ -2670,14 +2679,14 @@
}
if ( idButtonFile.down ) {
//DISABLE share
- /*if (idButtonFileShare.down === true) {
- pageStack.push(Qt.resolvedUrl("SharePage.qml"), {
+ if (idButtonFileShare.down === true) {
+ /*pageStack.push(Qt.resolvedUrl("SharePage.qml"), {
shareFilePath : idMediaPlayer.source.toString(),
shareFileName : origMediaFileName,
tmpVideoFileSize : tmpVideoFileSize,
- })
- console.log(tmpVideoFileSize)
- }*/
+ })*/
+ if (debug) console.log(tmpVideoFileSize)
+ }
if (idButtonFileRename.down === true) {
py.renameOriginal()
}
@@ -3340,7 +3349,7 @@
width: idToolsCategoriesRow.width
//Disable Share
- /*IconButton {
+ IconButton {
id: idButtonFileShare
down: true
width: parent.width / 4
@@ -3365,7 +3374,7 @@
anchors.bottomMargin: anchors.topMargin
color: backColorTools
}
- }*/
+ }
IconButton {
id: idButtonFileInfo
width: parent.width / 4
@@ -5973,6 +5982,7 @@
finishedLoading = false
undoNr = undoNr + 1
outputPathPy = tempMediaFolderPath + "video" + ".tmp" + undoNr + "." + tempMediaType
+ console.debug("pyPath: "+ outputPathPy)
}
function undoBackwards() {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.1.tar.bz2/qml/py/videox.py
^
|
| @@ -930,9 +930,6 @@
pyotherside.send('progressPercentage', progress)
if "true" in success :
pyotherside.send('loadTempMedia', outputPathPy )
- if (i.find(".wav") != -1): # delete temp recording file
- os.remove ( "/"+tempMediaFolderPath+i )
- pyotherside.send('tempFilesDeleted', i )
def audioEffectsFilters ( ffmpeg_staticPath, inputPathPy, outputPathPy, fromSec, toSec, effectTypeValue, origCodecAudio, filterType ):
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.1.tar.bz2/src/audio-recorder.cpp
^
|
| @@ -1,13 +1,18 @@
#include <QAudioRecorder>
#include <QUrl>
#include <QDir>
-
+#include <QString>
#include "audio-recorder.h"
AudioRecorder :: AudioRecorder ( QObject * parent ) : QObject ( parent ) {
q_audioRecorder = new QAudioRecorder ( this );
- q_audioRecorder -> setOutputLocation ( QUrl (QDir::homePath() + "/.clipper_tmp/recordedAudio.wav") );
+ /*QAudioEncoderSettings audioSettings;
+ audioSettings.setCodec("audio/amr");
+ audioSettings.setQuality(QMultimedia::HighQuality);
+ q_audioRecorder->setEncodingSettings(audioSettings);*/
+
+ q_audioRecorder -> setOutputLocation ( QUrl (QDir::homePath() + "/.cache/de.poetaster/harbour-clipper/recordedAudio.wav") );
q_audioRecorder -> setVolume( 10 );
b_recording = false;
@@ -20,7 +25,6 @@
void AudioRecorder :: record ( ) {
if ( q_audioRecorder -> state ( ) == QMediaRecorder :: StoppedState ) {
q_audioRecorder -> record ( );
-
b_recording = true;
emit recordingChanged ( );
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-clipper-0.4.1.tar.bz2/src/harbour-clipper.cpp
^
|
| @@ -5,6 +5,16 @@
#include <sailfishapp.h>
#include <src/audio-recorder.h>
+void migrateLocalStorage()
+{
+ // first for the new directory, post sailjail
+
+ QDir newDbDir( QDir::homePath() + "/.cache/de.poetaster/harbour-clipper/");
+
+ if( ! newDbDir.exists() )
+ newDbDir.mkpath(newDbDir.path());
+}
+
int main(int argc, char *argv[])
{
// SailfishApp::main() will display "qml/harbour-audiocut.qml", if you need more
@@ -16,6 +26,27 @@
// - SailfishApp::pathToMainQml() to get a QUrl to the main QML file
//
// To display the view, call "show()" (will show fullscreen on device).
+
+ QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
+
+ migrateLocalStorage();
+
+ // now set too new OrgName
+ app->setApplicationDisplayName("Videoworks");
+ app->setApplicationName("harbour-clipper");
+ app->setOrganizationDomain("de.poetaster");
+ app->setOrganizationName("de.poetaster"); // needed for Sailjail
+
+ QTranslator *appTranslator = new QTranslator;
+ appTranslator->load("harbour-clipper-" + QLocale::system().name(), SailfishApp::pathTo("translations").path());
+ app->installTranslator(appTranslator);
+
qmlRegisterType<AudioRecorder>("AudioRecorder", 1, 0, "AudioRecorder"); // needed for AudioRecorder to register as QML component
- return SailfishApp::main(argc, argv);
+
+ QScopedPointer<QQuickView> view(SailfishApp::createView());
+ view->setSource(SailfishApp::pathTo("qml/harbour-clipper.qml"));
+ view->setTitle("Videoworks");
+ view->showFullScreen();
+
+ return app->exec();
}
|
