nosklo
/
samplebrain
mirror of https://gitlab.com/then-try-this/samplebrain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: nosklo:df0fd84b48174c35b09a29fe9ff0649ca9e04b62
Branches Tags
nosklo:main
nosklo:production
nosklo:development
nosklo:v0.18.5_release
nosklo:0.18.4_release
nosklo:0.18.3_release
nosklo:0.18_release
..
compare: nosklo:6bc1cbeec3fdde1603733c2dc0d7e06732e06eb2
Branches Tags
nosklo:production
nosklo:development
nosklo:main
nosklo:v0.18.5_release
nosklo:0.18.4_release
nosklo:0.18.3_release
nosklo:0.18_release

4 Commits
df0fd84b48 ... 6bc1cbeec3

Author SHA1 Message Date
dave griffiths 6bc1cbeec3 Merge branch 'upgrade-to-qt6' into 'main' 
Update project to Qt6

See merge request then-try-this/samplebrain!2
 2022-09-24 20:56:12 +00:00
Dave Griffiths ff1d4cafd2 it's -> its 2022-09-24 21:51:20 +01:00
Dimitry Andric a831638171 Update project to Qt6: 
* loaded and saved `samplebrain.ui` in Qt6 Designer
* generate `ui_samplebrain.h` on the fly (via `FORMS +=`)
* remove example files `sample.ui` and `ui_sample.h`
* remove `setMargin()` calls, these methods have been removed
* use `QFont::Bold` for `setWeight()` calls, numeric values aren't accepted anymore
* qualify `spiralcore::sample` in `block.cpp`'s `normalise()`
 2022-09-24 22:50:43 +02:00
Dave Griffiths 0cfacdc8a8 turned off input device 2022-09-24 21:23:20 +01:00
11 changed files with 10 additions and 1428 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -5,7 +5,7 @@ A custom sample mashing app designed by Aphex Twin.
Samplebrain chops samples up into a 'brain' of interconnected small
sections called blocks which are connected into a network by
similarity. It processes a target sample, chopping it up into blocks
in the same way, and tries to match each block with one in it's brain
in the same way, and tries to match each block with one in its brain
to play in realtime.
This allows you to interpret a sound with a different one. As we

2
app/MainWindow.cpp
View File

@ -40,12 +40,10 @@ MainWindow::MainWindow() :
setUnifiedTitleAndToolBarOnMac(true);
m_Ui.verticalLayout_5->setSpacing(0);
m_Ui.verticalLayout_5->setMargin(0);
m_Ui.verticalLayout_5->setContentsMargins(0,0,0,0);
m_Ui.brain_contents->setAlignment(Qt::AlignTop);
m_Ui.brain_contents->setSpacing(0);
m_Ui.brain_contents->setMargin(0);
m_Ui.brain_contents->setContentsMargins(0,0,0,0);
// add default local dest

2
app/MainWindow.h
View File

@ -18,7 +18,7 @@
#include <QDirIterator>
#include <QFileDialog>
#include <QLineEdit>
#include "generated/ui_samplebrain.h"
#include "ui_samplebrain.h"
#include <iostream>
#include <lo/lo.h>

93
app/generated/ui_sample.h
View File

@ -1,93 +0,0 @@
/********************************************************************************
** Form generated from reading UI file 'sampleSy5241.ui'
**
** Created: Sat Jul 11 10:24:07 2015
** by: Qt User Interface Compiler version 4.8.1
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef SAMPLESY5241_H
#define SAMPLESY5241_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QCheckBox>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class Ui_FormSample
{
public:
QHBoxLayout *horizontalLayout;
QCheckBox *checkBox;
QLabel *labelSampleName;
QLabel *labelSampleInfo;
QPushButton *pushButton;
void setupUi(QWidget *FormSample)
{
if (FormSample->objectName().isEmpty())
FormSample->setObjectName(QString::fromUtf8("FormSample"));
FormSample->resize(400, 46);
horizontalLayout = new QHBoxLayout(FormSample);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
checkBox = new QCheckBox(FormSample);
checkBox->setObjectName(QString::fromUtf8("checkBox"));
QFont font;
font.setFamily(QString::fromUtf8("Comic Sans MS"));
font.setBold(true);
font.setWeight(75);
checkBox->setFont(font);
horizontalLayout->addWidget(checkBox);
labelSampleName = new QLabel(FormSample);
labelSampleName->setObjectName(QString::fromUtf8("labelSampleName"));
labelSampleName->setFont(font);
horizontalLayout->addWidget(labelSampleName);
labelSampleInfo = new QLabel(FormSample);
labelSampleInfo->setObjectName(QString::fromUtf8("labelSampleInfo"));
labelSampleInfo->setFont(font);
horizontalLayout->addWidget(labelSampleInfo);
pushButton = new QPushButton(FormSample);
pushButton->setObjectName(QString::fromUtf8("pushButton"));
pushButton->setFont(font);
horizontalLayout->addWidget(pushButton);
retranslateUi(FormSample);
QMetaObject::connectSlotsByName(FormSample);
} // setupUi
void retranslateUi(QWidget *FormSample)
{
FormSample->setWindowTitle(QApplication::translate("FormSample", "Form", 0, QApplication::UnicodeUTF8));
checkBox->setText(QApplication::translate("FormSample", "active", 0, QApplication::UnicodeUTF8));
labelSampleName->setText(QApplication::translate("FormSample", "TextLabel", 0, QApplication::UnicodeUTF8));
labelSampleInfo->setText(QApplication::translate("FormSample", "TextLabel", 0, QApplication::UnicodeUTF8));
pushButton->setText(QApplication::translate("FormSample", "delete", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui {
class FormSample: public Ui_FormSample {};
} // namespace Ui
QT_END_NAMESPACE
#endif // SAMPLESY5241_H

1209
app/generated/ui_samplebrain.h
View File

File diff suppressed because it is too large Load Diff

3
app/sound_items.cpp
View File

@ -37,7 +37,6 @@ sound_items::sound_item &sound_items::add(QVBoxLayout *container, const string &
si.m_container = new QHBoxLayout();
si.m_container->setSpacing(10);
si.m_container->setMargin(0);
si.m_container->setContentsMargins(0,0,0,0);
si.m_enable = new QCheckBox();
@ -56,7 +55,7 @@ sound_items::sound_item &sound_items::add(QVBoxLayout *container, const string &
QFont font;
font.setFamily(QString::fromUtf8("Comic Sans MS"));
font.setBold(true);
font.setWeight(75);
font.setWeight(QFont::Bold);
si.m_label->setFont(font);
si.m_label->setContentsMargins(0,0,0,0);

2
brain/src/block.cpp
View File

@ -36,7 +36,7 @@ double square(double a) {
return a*a;
}
void normalise(sample &in) {
void normalise(spiralcore::sample &in) {
// find min/max
float max = 0;
float min = FLT_MAX;

2
brain/src/spiralcore/portaudio_client.cpp
View File

@ -74,7 +74,7 @@ bool portaudio_client::attach(const string &client_name, const device_options &d
PaStreamParameters input_parameters;
PaStreamParameters *input_p=&input_parameters;
input_parameters.device = input_device_num;
if (input_parameters.device == paNoDevice) {
if (true || input_parameters.device == paNoDevice) {
cerr<<"error: no default input device."<<endl;
input_p=0;
} else {

77
gui/sample.ui
View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FormSample</class>
<widget class="QWidget" name="FormSample">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>46</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>active</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelSampleName">
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelSampleInfo">
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>delete</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

41
gui/samplebrain.ui
View File

@ -20,7 +20,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -40,7 +39,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -57,7 +55,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -117,7 +114,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -177,7 +173,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -200,7 +195,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -227,7 +221,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -256,7 +249,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -319,7 +311,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -382,7 +373,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -445,7 +435,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -514,7 +503,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -557,7 +545,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -620,7 +607,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -704,7 +690,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -718,7 +703,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -734,7 +718,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -765,7 +748,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -796,7 +778,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -856,7 +837,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -873,6 +853,7 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<bold>true</bold>
</font>
</property>
<property name="text">
@ -889,7 +870,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -906,7 +886,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -963,7 +942,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1020,7 +998,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1104,7 +1081,6 @@
<font>
<family>Comic Sans MS</family>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1151,7 +1127,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>424</width>
<width>600</width>
<height>198</height>
</rect>
</property>
@ -1170,7 +1146,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1184,7 +1159,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1198,7 +1172,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1216,7 +1189,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1247,7 +1219,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1278,7 +1249,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1338,7 +1308,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1354,7 +1323,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1368,7 +1336,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1432,7 +1399,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1459,7 +1425,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1535,7 +1500,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@ -1549,7 +1513,6 @@
<property name="font">
<font>
<family>Comic Sans MS</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>

5
samplebrain.pro
View File

@ -10,8 +10,9 @@ INCLUDEPATH += . 2
QT += core gui widgets
# Input
HEADERS += app/MainWindow.h \
app/generated/ui_samplebrain.h \
HEADERS += app/MainWindow.h
FORMS += gui/samplebrain.ui
SOURCES += app/MainWindow.cpp \
app/sound_items.cpp \