Merge lp://staging/~michael-sheldon/jokosher/export into lp://staging/jokosher
Proposed by
Michael Sheldon
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1117 | ||||
Proposed branch: | lp://staging/~michael-sheldon/jokosher/export | ||||
Merge into: | lp://staging/jokosher | ||||
Diff against target: |
2800 lines (+88/-2494) 13 files modified
Jokosher/Extension.py (+4/-2) Jokosher/Globals.py (+9/-5) Jokosher/JokosherApp.py (+62/-84) Jokosher/MixdownActions.py (+0/-542) Jokosher/MixdownProfileDialog.py (+0/-723) Jokosher/MixdownProfileManager.py (+0/-114) Jokosher/MixdownProfiles.py (+0/-311) Jokosher/Project.py (+9/-1) extensions/GNOMEAudioProfiles.py (+3/-3) gtk-builder-ui/AddMixdownActionDialog.ui (+0/-140) gtk-builder-ui/ConfigureExportFileAction.ui (+0/-257) gtk-builder-ui/MainWindow.ui (+1/-1) gtk-builder-ui/MixdownProfileDialog.ui (+0/-311) |
||||
To merge this branch: | bzr merge lp://staging/~michael-sheldon/jokosher/export | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laszlo Pandy | Needs Fixing | ||
Review via email:
|
Description of the change
Removes the mix down system in favour of a more traditional "Export" option. Provides ability to set sample rate and bit rate at export time and updates the gnome audio profiles extension to work with this new functionality (and fixes some old problems with that extension).
To post a comment you must log in.
155 + i = 0 SAMPLE_ RATES: .append_ text("% d Hz" % samplerate) DEFAULT_ SAMPLE_ RATE: .set_active( i) append_ text("% d kbps" % bitrate) DEFAULT_ BIT_RATE: set_active( i)
156 + for samplerate in Globals.
157 + sampleRateCombo
158 + if samplerate == Globals.
159 + sampleRateCombo
160 + i += 1
161 +
162 + i = 0
163 + for bitrate in Globals.BIT_RATES:
164 + bitRateCombo.
165 + if bitrate == Globals.
166 + bitRateCombo.
167 + i += 1
You should use: for index, samplerate in enumerate( Globals. SAMPLE_ RATES)
54 + ("Ogg Vorbis", "ogg", "vorbisenc bitrate=%d ! oggmux", True, True),
55 + ("MP3", "mp3", "lame bitrate=%d ", True, True),
Consider using: "bitrate= %(bitrate) d" and a dict with the % operator for clarity. This will also help if you have a second parameter in the future and you want them to be reorderable. Though this isn't a big deal because you should be able to change this code later without anything being backwards in compatible.