Commit Graph

71 Commits

Author SHA1 Message Date
Jonas Kvinge d09c27f719 Remove extra ';' 2019-11-10 00:30:18 +01:00
Jonas Kvinge d4fab4a2ea Merge remote-tracking branch 'upstream/master' into qt5-update 2018-11-11 22:46:07 +01:00
Amish Naidu 107e945872 Convert uses of QtAlgorithms to std:: algorithms 2018-10-09 19:17:54 +01:00
Chocobozzz 70f68b1926
Merge remote-tracking branch 'upstream/master' into qt5 2018-02-01 09:50:42 +01:00
Allan Nordhøy be79e8f92f Spelling: FLAC elsewhere (#5840) 2017-08-29 01:23:22 +02:00
Chocobozzz e6e189967d Merge remote-tracking branch 'upstream/master' into qt5 2016-02-29 18:03:02 +01:00
Mattias Andersson d9c4e0844d Use mp4mux instead of ffmux_mp4 when transcoding to aac 2016-01-12 15:59:23 +01:00
David Sansome a168b618d3 Rename "Import" to "Add directory" in the transcode dialog 2015-12-31 11:02:45 +11:00
Chocobozzz ff7026c9fe Merge remote-tracking branch 'upstream/master' into qt5 2015-12-13 20:05:12 +01:00
narunlifescience dd953fd86c check custom icon location, then system theme & then fallback theme
icons added & replaced
2015-10-13 22:35:49 -05:00
Chocobozzz e986ab5a4b Merge master branch and adapt it to qt5 2015-04-16 17:16:34 +02:00
Chocobozzz 8b226c2171 Update non optionnals sources to qt5 2015-04-11 23:24:07 +02:00
Mattias Andersson 8ad0e93381 Construct file paths correctly on all platforms 2015-02-20 19:19:45 +01:00
Mattias Andersson 7f4d467c27 Make the code clearer. 2015-02-19 16:49:42 +01:00
Andreas 880308c205 Remove async bus callback from transcoder. This caused the UI to get unresponsive after a song was converted.
A bit more information:
Normal transcoding worked fine, the transcoder object was in the main thread. In the network remote, a new transcoder object is created which runs in the network remote thread. When a song was transcoded there, the UI became unresponsive.
Removing the async bus callback solved the problem, exactly the g_source_remove() method caused it. Since the bus callback returned FALSE (GST_BUS_DROP), the watch was already removed. (See http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBus.html#gst-bus-add-watch)
2014-11-14 23:50:59 +01:00
Andreas ff172f6ed4 Network remote can now transcode lossless files before sending them to the remote.
- It is configurable in the settings.
- Any format can be chosen that is supported by the transcoder.
- The status of the transcoder is send to the remote.

- Transcoder format settings have now a postfix so we can define mutliple transcoder formats and use them separatly. Here one for the normal transcoder and one for the network remote transcode. You can pass the postfix in the constructor.
- Fixed Transcoder crash (was introduced with the gstreamer1.0 merge, decodebin doesn't have a "new-decoded-pad").
- Transcoder emits the output filename as well on "JobComplete" signal
- Transcoder can now convert a file to a temporary file ("AddTemporaryJob")
2014-11-13 22:31:49 +01:00
Andreas 8aa78af8f8 Save last used transcoder format with the mimetype instead of the extension.
ogg vorbis and ogg flac have the same extensions (*.ogg) and therefore the wrong item in the format combobox might be loaded.
2014-11-11 14:40:52 +01:00
Chocobozzz 50b7b7d889 Make format after update to avoid conflicts 2014-10-15 21:57:57 +02:00
Chocobozzz 8279f21251 Revert "Make format"
This reverts commit 17b1e9fbe6.
2014-10-15 21:55:03 +02:00
Chocobozzz 17b1e9fbe6 Make format 2014-10-15 20:55:24 +02:00
John Maguire aa3671b54a Merge pull request #4521 from Korvox/master
Add an option to pull all music files recursively into transcoding
2014-10-08 12:37:16 +02:00
Matthew Scheirer fdb88d4738 Fixed formatting for merge. 2014-09-28 19:34:28 -04:00
David Sansome 389d2972f5 Use decodebin in the transcoder (decodebin2 doesn't exist in gst-1.0). 2014-09-25 23:51:45 +10:00
Matthew Scheirer 3587e4197d Renamed rootPath to just path, changed dialog message to reflect UI message. 2014-09-24 19:53:13 -04:00
Matthew Scheirer 431f2e2978 Changed the transcode import tooltip and reimplemented using QDirIterator. 2014-09-15 16:45:47 -04:00
Matthew Scheirer f54e2da535 Adds an import button to the transcode UI, allowing the user to pull in all files in a folder heirarchy to be transcoded. 2014-09-09 20:21:54 -04:00
David Sansome 6bb81328e8 Merge branch 'master' into gstreamer-1.2
Conflicts:
	ext/clementine-spotifyblob/mediapipeline.cpp
	gst/moodbar/gstfftwspectrum.c
	src/core/songloader.cpp
	src/core/songloader.h
	src/engines/gstengine.cpp
	src/engines/gstenginepipeline.cpp
	src/moodbar/moodbarpipeline.cpp
	src/musicbrainz/chromaprinter.cpp
	src/transcoder/transcoder.cpp
	src/ui/mainwindow.cpp
	src/visualisations/projectmvisualisation.cpp
2014-06-09 16:20:24 +10:00
Mattias Andersson 98fd82a371 Use the TagReaderClient to tag the files in the CD ripper instead of
using Taglib directly.
2014-05-12 23:57:11 +02:00
David Sansome cf6cdc6936 Add disambiguation strings to "Quality". Fixes #4316 2014-05-11 17:35:23 +10:00
John Maguire 5146bcdebc Some more NULL -> nullptr conversions. 2014-02-21 17:30:46 +01:00
John Maguire 192b60d965 Use nullptr as parent parameter default everywhere 2014-02-10 16:03:54 +01:00
John Maguire 3323c2d094 Convert all instances of foreach() to a C++11 for
find ext src -name '*.cpp' -exec \
    sed -i -e 's/foreach(\([^,]\+\),/for (\1 :/' {} \;
2014-02-10 14:43:32 +01:00
John Maguire bebd781fdf Reformat all non-3rd-party C/C++/Objective-C++.
Command line:
find src ext -regex '.*\.\(h\|cpp\|mm\)' -exec clang-format -i
 -style='{BasedOnStyle: Google, DerivePointerBinding: false}' {} \;
2014-02-07 16:34:20 +01:00
John Maguire 71893e4847 Use nullptr instead of NULL everywhere. 2014-02-06 17:29:59 +01:00
John Maguire d309d4ab27 Use c++11 instead of boost where possible. 2014-02-06 16:51:39 +01:00
Mladen Pejaković e50ef0dd42 [Transcoder] Translate transcoder presets as well 2014-02-05 14:17:24 +01:00
David Sansome 5ac83bd463 Merge branch 'master' into gstreamer-1.2 2014-01-25 00:24:31 +11:00
asiviero 34c178af65 Merge branch 'master' into cdrip 2014-01-12 14:02:37 -02:00
Mattias Andersson 9647636ab7 Adjust the ui and clean up code.
The selection of a destination folder is now done by pressing the button 'Select...'.
The last selected folders along with the option 'Alongside the originals' are
available in the box 'destination'.

The methods TranscodeDialog::TrimPath and TranscodeDialog::GetOutputFileName are now
const.

Minor formatting fixes.
2014-01-11 22:13:11 +01:00
Mattias Andersson 294023cf2d Add the ability to choose destination folder in the transcoder dialog. 2014-01-11 10:06:41 +01:00
asiviero 215056e1b9 Added signal to catch transcoded name, altered duplicate format to avoid tagging problems 2014-01-11 02:47:49 -02:00
Martin Brodbeck 9cf8a2db94 Fix: Really do save Opus transcoding options 2013-12-16 13:45:23 +01:00
John Maguire 56c949815b First pass at Gstreamer 1.0 porting.
This at least compiles against gstreamer 1.2.
Things that work:
* Playing audio
* Automatically completing tags

Things that don't work
* Spotify
* Moodbar

Things I haven't tested
* Transcoding
2013-09-26 17:49:24 +02:00
Andreas 9ff9050d9c Select files to transcode directly from a playlist. 2013-06-30 16:54:13 +02:00
John Maguire 90803fa0e0 Remove use of deprecated gstreamer functions. 2013-01-29 13:19:26 +01:00
Martin Brodbeck d5139ac2b2 Add opus support to transcoder.
Fixes issue #3453
2013-01-28 14:09:31 +01:00
David Sansome 88d4e533b4 Enable horizontal scrolling in the Transcode dialog so the user can see the whole path.
Fixes issue 3081
2012-08-01 20:51:44 +01:00
David Sansome 0459cbf9f0 Add a clear button to the Transcode Music log dialog.
Fixes issue 3082
2012-08-01 20:48:05 +01:00
John Maguire cbc650f44b Use CHECKED_GCONNECT instead of g_signal_connect everywhere. 2012-06-08 15:34:00 +02:00
David Sansome 2cb61908a9 Add .ape and .wv files to the file view filter, and use this same list in the Open Music dialog. Fixes issue 2533 2012-01-29 20:10:00 +00:00