Skip to content

Commit

Permalink
Merge pull request #6 from andreasGBL/develop
Browse files Browse the repository at this point in the history
Several Bug Fixes / Quality of Life improvements
  • Loading branch information
andreasGBL authored May 24, 2023
2 parents 0d349a3 + 58c66d6 commit 7122f6f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Alternatively just download the latest [Release](https://github.com/andreasGBL/V
- when the hardware accelerated codecs fail, try updating your drivers - if that doesn't work try different parameters and maybe try to change some parameters back to "As Input"
- AMD hardware acceleration is just barely tested
- A maximum video length of 23:59:59.999 (up to 24 hours of video) is supported
- No AV1 support yet, although it is already supported by ffmpeg

# License
This open source software is licensed under [GPLv3](LICENSE).
Expand Down
5 changes: 4 additions & 1 deletion src/VideoCutWindow/videocutwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ void VideoCutWindow::setInitialStartAndEnd(QTime const & start, QTime const & en
void VideoCutWindow::closeWindow(QTime start, QTime end, bool cancelled)
{
emit newCutInformation(start, end, cancelled);
mediaPlayer->pause();
// only pause when the end of the video isn't reached yet to prevent weird "DirectShowPlayerService::doRender: Unresolved error code 0x80040218 (IDispatch error #24)" bug:
if (getTimeForVideoPosition(mediaPlayer->position()) < currentVideo->length) {
mediaPlayer->pause();
}
this->setVisible(false);
}

Expand Down
15 changes: 14 additions & 1 deletion src/filedropwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <QMimeData>
#include <QRegularExpression>
#include <QDir>

#include <QMessageBox>

#include <iostream>
#include <cstdio>
Expand Down Expand Up @@ -59,6 +59,19 @@ void FileDropWidget::dropEvent(QDropEvent * event)
if (acceptMimeType(mimeData)) {
//accept File
QString path = mimeData->text().split("file:///")[1];
bool unsupported_chars = false;
QString unsupported("");
for (QChar ch : path) {
if (ch.unicode() > 127) {
unsupported_chars = true;
unsupported += ch;
}
}
if (unsupported_chars) {
std::cout << "Unsupported Characters in File name.\n";
QMessageBox::critical(nullptr, "Error", "Unsupported Characters in File name:\n(\"" + unsupported + "\")\n");
return;
}
std::cout << "New File: " << path.toStdString() << std::endl;
setText(tr(breakLines(path, 40).toStdString().c_str()));

Expand Down

0 comments on commit 7122f6f

Please sign in to comment.