Fixed TAS splicer functions so that they build uncommented.
This commit is contained in:
parent
be417b7d3b
commit
39f90e04e7
|
@ -34,6 +34,7 @@
|
|||
#include <QFileDialog>
|
||||
#include <QStandardPaths>
|
||||
#include <QApplication>
|
||||
#include <QGuiApplication>
|
||||
|
||||
#include "fceu.h"
|
||||
#include "movie.h"
|
||||
|
@ -289,6 +290,8 @@ TasEditorWindow::TasEditorWindow(QWidget *parent)
|
|||
::branches = &this->branches;
|
||||
::splicer = &this->splicer;
|
||||
|
||||
clipboard = QGuiApplication::clipboard();
|
||||
|
||||
setWindowTitle("TAS Editor");
|
||||
|
||||
resize(512, 512);
|
||||
|
@ -1247,6 +1250,16 @@ void TasEditorWindow::playbackFrameForwardFull(void)
|
|||
fceuWrapperUnLock();
|
||||
}
|
||||
// ----------------------------------------------------------------------------------------------
|
||||
void TasEditorWindow::loadClipboard(const char *txt)
|
||||
{
|
||||
clipboard->setText( tr(txt), QClipboard::Clipboard );
|
||||
|
||||
if ( clipboard->supportsSelection() )
|
||||
{
|
||||
clipboard->setText( tr(txt), QClipboard::Selection );
|
||||
}
|
||||
}
|
||||
// ----------------------------------------------------------------------------------------------
|
||||
// following functions use function parameters to determine range of frames
|
||||
void TasEditorWindow::toggleInput(int start, int end, int joy, int button, int consecutivenessTag)
|
||||
{
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <QFont>
|
||||
#include <QPainter>
|
||||
#include <QShortcut>
|
||||
#include <QClipboard>
|
||||
|
||||
#include "Qt/TasEditor/taseditor_config.h"
|
||||
#include "Qt/TasEditor/taseditor_project.h"
|
||||
|
@ -164,6 +165,7 @@ class TasEditorWindow : public QDialog
|
|||
HISTORY history;
|
||||
BRANCHES branches;
|
||||
|
||||
void loadClipboard(const char *txt);
|
||||
void toggleInput(int start, int end, int joy, int button, int consecutivenessTag);
|
||||
void setInputUsingPattern(int start, int end, int joy, int button, int consecutivenessTag);
|
||||
|
||||
|
@ -227,6 +229,8 @@ class TasEditorWindow : public QDialog
|
|||
QPushButton *similarBtn;
|
||||
QPushButton *moreBtn;
|
||||
|
||||
QClipboard *clipboard;
|
||||
|
||||
std::vector<std::string> patternsNames;
|
||||
std::vector<std::vector<uint8_t>> patterns;
|
||||
private:
|
||||
|
@ -257,6 +261,7 @@ class TasEditorWindow : public QDialog
|
|||
void playbackFrameForwardFull(void);
|
||||
|
||||
friend class RECORDER;
|
||||
friend class SPLICER;
|
||||
};
|
||||
|
||||
extern TASEDITOR_PROJECT *project;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue