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 6 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
49 changes: 24 additions & 25 deletions src/core/ProjectRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,33 +41,33 @@ const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
{

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

@lukas-w lukas-w Sep 27, 2017

Choose a reason for hiding this comment

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

While we're at it, can we make this say "Ogg-Vorbis" instead? This would correctly reflect the fact that Ogg is merely the container format, while Vorbis is the audio codec that's being used here.

Copy link
Member

@tresf tresf Sep 27, 2017

Choose a reason for hiding this comment

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

From wikipedia.org:

Before 2007, the .ogg filename extension was used for all files whose content used the Ogg container format. Since 2007, the Xiph.Org Foundation recommends that .ogg only be used for Ogg Vorbis audio files. The Xiph.Org Foundation decided to create a new set of file extensions and media types to describe different types of content such as .oga for audio only files, .ogv for video with or without sound (including Theora), and .ogx for multiplexed Ogg.[4]

"OGG" should be just fine.

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

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

Expand All @@ -89,7 +89,7 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings
{
AudioFileDeviceInstantiaton audioEncoderFactory = fileEncodeDevices[exportFileFormat].m_getDevInst;

if (audioEncoderFactory)
if ( audioEncoderFactory )
{
bool successful = false;

Expand All @@ -109,15 +109,15 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings

ProjectRenderer::~ProjectRenderer()
{
Engine::mixer()->restoreAudioDevice(); // also deletes audio-dev
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 )
{
Expand All @@ -131,7 +131,7 @@ ProjectRenderer::ExportFileFormats ProjectRenderer::getFileFormatFromExtension(
++idx;
}

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


Expand All @@ -151,11 +151,10 @@ void ProjectRenderer::startProcessing()

if( isReady() )
{
// have to do mixer stuff with GUI-thread-affinity in order to
// make slots connected to sampleRateChanged()-signals being
// called immediately
// 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 );
m_qualitySettings, false);

start(
#ifndef LMMS_BUILD_WIN32
Expand All @@ -182,7 +181,7 @@ void ProjectRenderer::run()

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

const Song::PlayPos & exportPos = Engine::getSong()->getPlayPos(
Expand All @@ -193,26 +192,26 @@ void ProjectRenderer::run()
tick_t endTick = exportEndpoints.second.getTicks();
tick_t lengthTicks = endTick - startTick;

// Continually track and emit progress percentage to listeners
// 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;
const int nprog = lengthTicks == 0 ? 100 : ( exportPos.getTicks()-startTick) * 100 / lengthTicks;
if( m_progress != nprog )
{
m_progress = nprog;
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 )
{
Expand All @@ -231,6 +230,7 @@ void ProjectRenderer::abortProcessing()




void ProjectRenderer::updateConsoleProgress()
{
const int cols = 50;
Expand All @@ -244,15 +244,14 @@ void ProjectRenderer::updateConsoleProgress()
}
prog[cols] = 0;

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

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



11 changes: 7 additions & 4 deletions src/gui/AboutDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ AboutDialog::AboutDialog(QWidget* parent) :
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