Skip to content

About dialog & export dialog improvements. #3826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 14 commits into from
Nov 15, 2017
Merged

About dialog & export dialog improvements. #3826

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c31bb5
Initial commit.
Sep 25, 2017
d1e2815
Fixes.
Sep 25, 2017
b1cc942
Some about dialog changes.
Sep 26, 2017
b2ea361
Change color of link to something green-ish.
Sep 26, 2017
0404639
Commeneted out useless code.
Sep 26, 2017
1da95ba
Formatting reverse.
Sep 27, 2017
015f4c9
Formatting reverse 2.
Sep 27, 2017
080c8b4
Formatting reverse 3.
Sep 27, 2017
4398747
Return "Involved" tab. Revert AboutDialog.cpp changes.
Sep 27, 2017
351c8ca
Commented out "Export as loop".
Sep 30, 2017
10f4924
Undo commented out "Export as loop".
Sep 30, 2017
9da7ae6
ED: (Remove end silence) -> (Remove extra bar).
Oct 26, 2017
bb43f97
Export dialog should not be resizable.
Oct 27, 2017
aa589fa
"LMMS developers" to "LMMS Developers".
Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ STRING(TOUPPER "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
# Updated by maintenance tasks
SET(PROJECT_YEAR 2015)

SET(PROJECT_AUTHOR "LMMS Developers")
SET(PROJECT_AUTHOR "LMMS developers")
Copy link
Member

@tresf tresf Sep 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why lowercase here? Is this necessary change as part of this PR or was it something that was never reverted after testing?

Copy link
Member Author

@husamalhomsi husamalhomsi Nov 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the latter. I will capitalize it.

SET(PROJECT_URL "https://lmms.io")
SET(PROJECT_EMAIL "[email protected]")
SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software")
Expand Down
162 changes: 79 additions & 83 deletions src/core/ProjectRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,55 +37,54 @@
#include "sched.h"
#endif


const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
{

{ ProjectRenderer::WaveFile,
QT_TRANSLATE_NOOP( "ProjectRenderer", "WAV-File (*.wav)" ),
".wav", &AudioFileWave::getInst },
{ ProjectRenderer::FlacFile,
QT_TRANSLATE_NOOP("ProjectRenderer", "FLAC-File (*.flac)"),
".flac",
&AudioFileFlac::getInst
{ProjectRenderer::WaveFile,
Copy link
Member

@tresf tresf Sep 26, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to stop translating stuff like *.wav, *.mp3. This is only going to cause issues down the road where a bad translation breaks a feature.

Copy link
Member

@Umcaruje Umcaruje Sep 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah according to #3677 this is already making problems in other places

Copy link
Member Author

@husamalhomsi husamalhomsi Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just removed the space after { here.
Do you want me to keep the strings but make them untranslatable? If so, is removing QT_TRANSLATE_NOOP enough?

QT_TRANSLATE_NOOP("ProjectRenderer", "WAV (*.wav)"),
".wav", &AudioFileWave::getInst},
{ProjectRenderer::FlacFile,
QT_TRANSLATE_NOOP("ProjectRenderer", "FLAC (*.flac)"),
".flac",
&AudioFileFlac::getInst
},
{ ProjectRenderer::OggFile,
QT_TRANSLATE_NOOP( "ProjectRenderer", "Compressed OGG-File (*.ogg)" ),
".ogg",
{ProjectRenderer::OggFile,
QT_TRANSLATE_NOOP("ProjectRenderer", "OGG (*.ogg)"),
".ogg",
#ifdef LMMS_HAVE_OGGVORBIS
&AudioFileOgg::getInst
&AudioFileOgg::getInst
#else
NULL
NULL
#endif
},
{ ProjectRenderer::MP3File,
QT_TRANSLATE_NOOP( "ProjectRenderer", "Compressed MP3-File (*.mp3)" ),
".mp3",
},
{ProjectRenderer::MP3File,
QT_TRANSLATE_NOOP("ProjectRenderer", "MP3 (*.mp3)"),
".mp3",
#ifdef LMMS_HAVE_MP3LAME
&AudioFileMP3::getInst
&AudioFileMP3::getInst
#else
NULL
NULL
#endif
},
// ... insert your own file-encoder-infos here... may be one day the
// user can add own encoders inside the program...

{ ProjectRenderer::NumFileFormats, NULL, NULL, NULL }
},
// Insert your own file-encoder infos here.
// Maybe one day the user can add own encoders inside the program.

} ;
{ProjectRenderer::NumFileFormats, NULL, NULL, NULL}
};




ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings,
const OutputSettings & outputSettings,
ExportFileFormats exportFileFormat,
const QString & outputFilename ) :
QThread( Engine::mixer() ),
m_fileDev( NULL ),
m_qualitySettings( qualitySettings ),
m_oldQualitySettings( Engine::mixer()->currentQualitySettings() ),
m_progress( 0 ),
m_abort( false )
ProjectRenderer::ProjectRenderer(const Mixer::qualitySettings & qualitySettings,
const OutputSettings & outputSettings,
ExportFileFormats exportFileFormat,
const QString & outputFilename) :
QThread(Engine::mixer()),
m_fileDev(NULL),
m_qualitySettings(qualitySettings),
m_oldQualitySettings(Engine::mixer()->currentQualitySettings()),
m_progress(0),
m_abort(false)
{
AudioFileDeviceInstantiaton audioEncoderFactory = fileEncodeDevices[exportFileFormat].m_getDevInst;

Expand All @@ -95,8 +94,8 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings

m_fileDev = audioEncoderFactory(
outputFilename, outputSettings, DEFAULT_CHANNELS,
Engine::mixer(), successful );
if( !successful )
Engine::mixer(), successful);
if(!successful)
{
delete m_fileDev;
m_fileDev = NULL;
Expand All @@ -109,36 +108,35 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings

ProjectRenderer::~ProjectRenderer()
{
Engine::mixer()->restoreAudioDevice(); // also deletes audio-dev
Engine::mixer()->changeQuality( m_oldQualitySettings );
Engine::mixer()->restoreAudioDevice(); // Also deletes audio dev.
Engine::mixer()->changeQuality(m_oldQualitySettings);
}




// little help-function for getting file-format from a file-extension (only for
// registered file-encoders)
// Little help function for getting file format from a file extension
// (only for registered file-encoders).
ProjectRenderer::ExportFileFormats ProjectRenderer::getFileFormatFromExtension(
const QString & _ext )
const QString & _ext)
{
int idx = 0;
while( fileEncodeDevices[idx].m_fileFormat != NumFileFormats )
while(fileEncodeDevices[idx].m_fileFormat != NumFileFormats)
{
if( QString( fileEncodeDevices[idx].m_extension ) == _ext )
if(QString(fileEncodeDevices[idx].m_extension) == _ext)
{
return( fileEncodeDevices[idx].m_fileFormat );
return(fileEncodeDevices[idx].m_fileFormat);
}
++idx;
}

return( WaveFile ); // default
return(WaveFile); // Default.
}




QString ProjectRenderer::getFileExtensionFromFormat(
ExportFileFormats fmt )
ExportFileFormats fmt)
{
return fileEncodeDevices[fmt].m_extension;
}
Expand All @@ -149,74 +147,74 @@ QString ProjectRenderer::getFileExtensionFromFormat(
void ProjectRenderer::startProcessing()
{

if( isReady() )
if(isReady())
{
// have to do mixer stuff with GUI-thread-affinity in order to
// make slots connected to sampleRateChanged()-signals being
// called immediately
Engine::mixer()->setAudioDevice( m_fileDev,
m_qualitySettings, false );
// Have to do mixer stuff with GUI-thread affinity in order to
// make slots connected to sampleRateChanged()-signals being called immediately.
Engine::mixer()->setAudioDevice(m_fileDev,
m_qualitySettings, false);

start(
#ifndef LMMS_BUILD_WIN32
QThread::HighPriority
QThread::HighPriority
#endif
);

);
}
}




void ProjectRenderer::run()
{
#if 0
#ifdef LMMS_BUILD_LINUX
#ifdef LMMS_HAVE_SCHED_H
cpu_set_t mask;
CPU_ZERO( &mask );
CPU_SET( 0, &mask );
sched_setaffinity( 0, sizeof( mask ), &mask );
CPU_ZERO(&mask);
CPU_SET(0, &mask);
sched_setaffinity(0, sizeof(mask), &mask);
#endif
#endif
#endif

Engine::getSong()->startExport();
Engine::getSong()->updateLength();
//skip first empty buffer
// Skip first empty buffer.
Engine::mixer()->nextBuffer();

const Song::PlayPos & exportPos = Engine::getSong()->getPlayPos(
Song::Mode_PlaySong );
Song::Mode_PlaySong);
m_progress = 0;
std::pair<MidiTime, MidiTime> exportEndpoints = Engine::getSong()->getExportEndpoints();
tick_t startTick = exportEndpoints.first.getTicks();
tick_t endTick = exportEndpoints.second.getTicks();
tick_t lengthTicks = endTick - startTick;

// Continually track and emit progress percentage to listeners
while( exportPos.getTicks() < endTick &&
Engine::getSong()->isExporting() == true
&& !m_abort )
// Continually track and emit progress percentage to listeners.
while(exportPos.getTicks() < endTick &&
Engine::getSong()->isExporting() == true
&& !m_abort)
{
m_fileDev->processNextBuffer();
const int nprog = lengthTicks == 0 ? 100 : (exportPos.getTicks()-startTick) * 100 / lengthTicks;
if( m_progress != nprog )
if(m_progress != nprog)
{
m_progress = nprog;
emit progressChanged( m_progress );
emit progressChanged(m_progress);
}
}

// notify mixer of the end of processing
// Notify mixer of the end of processing.
Engine::mixer()->stopProcessing();

Engine::getSong()->stopExport();

// if the user aborted export-process, the file has to be deleted
// If the user aborted export-process, the file has to be deleted.
const QString f = m_fileDev->outputFile();
if( m_abort )
if(m_abort)
{
QFile( f ).remove();
QFile(f).remove();
}
}

Expand All @@ -231,28 +229,26 @@ void ProjectRenderer::abortProcessing()




void ProjectRenderer::updateConsoleProgress()
{
const int cols = 50;
static int rot = 0;
char buf[80];
char prog[cols+1];

for( int i = 0; i < cols; ++i )
for(int i = 0; i < cols; ++i)
{
prog[i] = ( i*100/cols <= m_progress ? '-' : ' ' );
prog[i] = (i*100/cols <= m_progress ? '-' : ' ');
}
prog[cols] = 0;

const char * activity = (const char *) "|/-\\";
memset( buf, 0, sizeof( buf ) );
sprintf( buf, "\r|%s| %3d%% %c ", prog, m_progress,
activity[rot] );
rot = ( rot+1 ) % 4;
memset(buf, 0, sizeof(buf));
sprintf(buf, "\r|%s| %3d%% %c ", prog, m_progress,
activity[rot]);
rot = (rot+1) % 4;

fprintf( stderr, "%s", buf );
fflush( stderr );
fprintf(stderr, "%s", buf);
fflush(stderr);
}



34 changes: 18 additions & 16 deletions src/gui/AboutDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,34 @@
#include "versioninfo.h"



AboutDialog::AboutDialog(QWidget* parent) :
QDialog(parent),
Ui::AboutDialog()
{
setupUi( this );
setupUi(this);


iconLabel->setPixmap( embed::getIconPixmap( "icon", 64, 64 ) );
iconLabel->setPixmap(embed::getIconPixmap("icon", 64, 64));

versionLabel->setText( versionLabel->text().
arg( LMMS_VERSION ).
arg( PLATFORM ).
arg( MACHINE ).
arg( QT_VERSION_STR ).
arg( GCC_VERSION ) );
versionLabel->setText(versionLabel->text().
arg(LMMS_VERSION).
arg(PLATFORM).
arg(MACHINE).
arg(QT_VERSION_STR).
arg(GCC_VERSION));
versionLabel->setTextInteractionFlags(
versionLabel->textInteractionFlags() |
Qt::TextSelectableByMouse );
versionLabel->textInteractionFlags() |
Qt::TextSelectableByMouse);

copyrightLabel->setText( copyrightLabel->text().
arg( LMMS_PROJECT_COPYRIGHT ) );
copyrightLabel->setText(copyrightLabel->text().
arg(LMMS_PROJECT_COPYRIGHT));

authorLabel->setPlainText( embed::getText( "AUTHORS" ) );
authorLabel->setPlainText(
embed::getText("AUTHORS"));

licenseLabel->setPlainText( embed::getText( "LICENSE.txt" ) );
/*involvedLabel->setPlainText(
Copy link
Member

@Umcaruje Umcaruje Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you disable the contributors file, it contains all of our github contributors and it's more accurate than the authors file (though the authors file contains some people that wouldn't be credited through github)

Copy link
Member

@lukas-w lukas-w Sep 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it contains all of our github contributors

@Umcaruje Not anymore, jasp00 removed the CMake logic that used to create the file in 30f1e52. He planned to replace that by a maintenance task on our server, but it appears it was never implemented correctly. That's probably why @Sawuare removed it. Related: LMMS/lmms.io/pull/198, #3016

Copy link
Member

@Umcaruje Umcaruje Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then, should we update the authors file with some missing people? Or revert @jasp00's changes, since he sent a mail saying he won't be able to contribute for some time.

Copy link
Member Author

@husamalhomsi husamalhomsi Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know the story of the contributors tab. I just removed it because it didn't display anything other than: "Contributors ordered by number of commit:".

embed::getText("CONTRIBUTORS"));*/

involvedLabel->setPlainText( embed::getText( "CONTRIBUTORS" ) );
licenseLabel->setPlainText(
embed::getText("LICENSE.txt"));
}
Loading