Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-21 16:11:11 +01:00
Code Issues Releases Wiki Activity

Campbell Barton's further patch to turn many, many tabs to our 3-space convenbtion

Browse Source
This commit is contained in:
v.audacity
2013-02-23 04:33:20 +00:00
parent 2479a13187
commit c26b3c6b49
74 changed files with 1891 additions and 1891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/export/Export.cpp
View File

@@ -1088,10 +1088,10 @@ found:
// ExportMixerDialog
//----------------------------------------------------------------------------
enum
enum
{
ID_MIXERPANEL = 10001,
ID_SLIDER_CHANNEL
ID_MIXERPANEL = 10001,
ID_SLIDER_CHANNEL
};
BEGIN_EVENT_TABLE( ExportMixerDialog,wxDialog )

12
src/export/ExportFLAC.cpp
View File

@@ -253,11 +253,11 @@ int ExportFLAC::Export(AudacityProject *project,
sampleFormat format;
if (bitDepthPref == wxT("24")) {
format = int24Sample;
encoder.set_bits_per_sample(24);
format = int24Sample;
encoder.set_bits_per_sample(24);
} else { //convert float to 16 bits
format = int16Sample;
encoder.set_bits_per_sample(16);
format = int16Sample;
encoder.set_bits_per_sample(16);
}
// Duplicate the flac command line compression levels
@@ -316,7 +316,7 @@ int ExportFLAC::Export(AudacityProject *project,
int i, j;
FLAC__int32 **tmpsmplbuf = new FLAC__int32*[numChannels];
for (i = 0; i < numChannels; i++) {
tmpsmplbuf[i] = (FLAC__int32 *) calloc(SAMPLES_PER_RUN, sizeof(FLAC__int32));
tmpsmplbuf[i] = (FLAC__int32 *) calloc(SAMPLES_PER_RUN, sizeof(FLAC__int32));
}
ProgressDialog *progress = new ProgressDialog(wxFileName(fName).GetName(),
@@ -353,7 +353,7 @@ int ExportFLAC::Export(AudacityProject *project,
delete progress;
for (i = 0; i < numChannels; i++) {
free(tmpsmplbuf[i]);
free(tmpsmplbuf[i]);
}
delete mixer;

2
src/export/ExportMP2.cpp
View File

@@ -301,7 +301,7 @@ int ExportMP2::Export(AudacityProject *project,
delete mixer;
int mp2BufferNumBytes = twolame_encode_flush(
int mp2BufferNumBytes = twolame_encode_flush(
encodeOptions,
mp2Buffer,
mp2BufferSize);

170
src/export/ExportMP3.cpp
View File

@@ -751,31 +751,31 @@ typedef unsigned long beWriteInfoTag_t(lame_global_flags *, char *);
// so we can be more specific about why their library isn't acceptable.
typedef struct {
// BladeEnc DLL Version number
// BladeEnc DLL Version number
BYTE byDLLMajorVersion;
BYTE byDLLMinorVersion;
BYTE byDLLMajorVersion;
BYTE byDLLMinorVersion;
// BladeEnc Engine Version Number
// BladeEnc Engine Version Number
BYTE byMajorVersion;
BYTE byMinorVersion;
BYTE byMajorVersion;
BYTE byMinorVersion;
// DLL Release date
// DLL Release date
BYTE byDay;
BYTE byMonth;
WORD wYear;
BYTE byDay;
BYTE byMonth;
WORD wYear;
// BladeEnc Homepage URL
// BladeEnc Homepage URL
CHAR zHomepage[129];
CHAR zHomepage[129];
BYTE byAlphaLevel;
BYTE byBetaLevel;
BYTE byMMXEnabled;
BYTE byAlphaLevel;
BYTE byBetaLevel;
BYTE byMMXEnabled;
BYTE btReserved[125];
BYTE btReserved[125];
} be_version;
typedef void beVersion_t(be_version *);
#endif
@@ -1467,89 +1467,89 @@ wxString MP3Exporter::GetLibraryTypeString()
// Debug routine from BladeMP3EncDLL.c in the libmp3lame distro
static void dump_config( lame_global_flags* gfp )
{
wxPrintf(wxT("\n\nLame_enc configuration options:\n"));
wxPrintf(wxT("==========================================================\n"));
wxPrintf(wxT("\n\nLame_enc configuration options:\n"));
wxPrintf(wxT("==========================================================\n"));
wxPrintf(wxT("version =%d\n"),lame_get_version( gfp ) );
wxPrintf(wxT("Layer =3\n"));
wxPrintf(wxT("mode ="));
switch ( lame_get_mode( gfp ) )
{
case STEREO: wxPrintf(wxT( "Stereo\n" )); break;
case JOINT_STEREO: wxPrintf(wxT( "Joint-Stereo\n" )); break;
case DUAL_CHANNEL: wxPrintf(wxT( "Forced Stereo\n" )); break;
case MONO: wxPrintf(wxT( "Mono\n" )); break;
case NOT_SET: /* FALLTROUGH */
default: wxPrintf(wxT( "Error (unknown)\n" )); break;
}
wxPrintf(wxT("version =%d\n"),lame_get_version( gfp ) );
wxPrintf(wxT("Layer =3\n"));
wxPrintf(wxT("mode ="));
switch ( lame_get_mode( gfp ) )
{
case STEREO: wxPrintf(wxT( "Stereo\n" )); break;
case JOINT_STEREO: wxPrintf(wxT( "Joint-Stereo\n" )); break;
case DUAL_CHANNEL: wxPrintf(wxT( "Forced Stereo\n" )); break;
case MONO: wxPrintf(wxT( "Mono\n" )); break;
case NOT_SET: /* FALLTROUGH */
default: wxPrintf(wxT( "Error (unknown)\n" )); break;
}
wxPrintf(wxT("Input sample rate =%.1f kHz\n"), lame_get_in_samplerate( gfp ) /1000.0 );
wxPrintf(wxT("Output sample rate =%.1f kHz\n"), lame_get_out_samplerate( gfp ) /1000.0 );
wxPrintf(wxT("Input sample rate =%.1f kHz\n"), lame_get_in_samplerate( gfp ) /1000.0 );
wxPrintf(wxT("Output sample rate =%.1f kHz\n"), lame_get_out_samplerate( gfp ) /1000.0 );
wxPrintf(wxT("bitrate =%d kbps\n"), lame_get_brate( gfp ) );
wxPrintf(wxT("Quality Setting =%d\n"), lame_get_quality( gfp ) );
wxPrintf(wxT("bitrate =%d kbps\n"), lame_get_brate( gfp ) );
wxPrintf(wxT("Quality Setting =%d\n"), lame_get_quality( gfp ) );
wxPrintf(wxT("Low pass frequency =%d\n"), lame_get_lowpassfreq( gfp ) );
wxPrintf(wxT("Low pass width =%d\n"), lame_get_lowpasswidth( gfp ) );
wxPrintf(wxT("Low pass frequency =%d\n"), lame_get_lowpassfreq( gfp ) );
wxPrintf(wxT("Low pass width =%d\n"), lame_get_lowpasswidth( gfp ) );
wxPrintf(wxT("High pass frequency =%d\n"), lame_get_highpassfreq( gfp ) );
wxPrintf(wxT("High pass width =%d\n"), lame_get_highpasswidth( gfp ) );
wxPrintf(wxT("High pass frequency =%d\n"), lame_get_highpassfreq( gfp ) );
wxPrintf(wxT("High pass width =%d\n"), lame_get_highpasswidth( gfp ) );
wxPrintf(wxT("No short blocks =%d\n"), lame_get_no_short_blocks( gfp ) );
wxPrintf(wxT("Force short blocks =%d\n"), lame_get_force_short_blocks( gfp ) );
wxPrintf(wxT("No short blocks =%d\n"), lame_get_no_short_blocks( gfp ) );
wxPrintf(wxT("Force short blocks =%d\n"), lame_get_force_short_blocks( gfp ) );
wxPrintf(wxT("de-emphasis =%d\n"), lame_get_emphasis( gfp ) );
wxPrintf(wxT("private flag =%d\n"), lame_get_extension( gfp ) );
wxPrintf(wxT("de-emphasis =%d\n"), lame_get_emphasis( gfp ) );
wxPrintf(wxT("private flag =%d\n"), lame_get_extension( gfp ) );
wxPrintf(wxT("copyright flag =%d\n"), lame_get_copyright( gfp ) );
wxPrintf(wxT("original flag =%d\n"), lame_get_original( gfp ) );
wxPrintf(wxT("CRC =%s\n"), lame_get_error_protection( gfp ) ? wxT("on") : wxT("off") );
wxPrintf(wxT("Fast mode =%s\n"), ( lame_get_quality( gfp ) )? wxT("enabled") : wxT("disabled") );
wxPrintf(wxT("Force mid/side stereo =%s\n"), ( lame_get_force_ms( gfp ) )?wxT("enabled"):wxT("disabled") );
wxPrintf(wxT("Padding Type =%d\n"), lame_get_padding_type( gfp ) );
wxPrintf(wxT("Disable Reservoir =%d\n"), lame_get_disable_reservoir( gfp ) );
wxPrintf(wxT("Allow diff-short =%d\n"), lame_get_allow_diff_short( gfp ) );
wxPrintf(wxT("Interchannel masking =%f\n"), lame_get_interChRatio( gfp ) );
wxPrintf(wxT("Strict ISO Encoding =%s\n"), ( lame_get_strict_ISO( gfp ) ) ?wxT("Yes"):wxT("No"));
wxPrintf(wxT("Scale =%5.2f\n"), lame_get_scale( gfp ) );
wxPrintf(wxT("copyright flag =%d\n"), lame_get_copyright( gfp ) );
wxPrintf(wxT("original flag =%d\n"), lame_get_original( gfp ) );
wxPrintf(wxT("CRC =%s\n"), lame_get_error_protection( gfp ) ? wxT("on") : wxT("off") );
wxPrintf(wxT("Fast mode =%s\n"), ( lame_get_quality( gfp ) )? wxT("enabled") : wxT("disabled") );
wxPrintf(wxT("Force mid/side stereo =%s\n"), ( lame_get_force_ms( gfp ) )?wxT("enabled"):wxT("disabled") );
wxPrintf(wxT("Padding Type =%d\n"), lame_get_padding_type( gfp ) );
wxPrintf(wxT("Disable Reservoir =%d\n"), lame_get_disable_reservoir( gfp ) );
wxPrintf(wxT("Allow diff-short =%d\n"), lame_get_allow_diff_short( gfp ) );
wxPrintf(wxT("Interchannel masking =%f\n"), lame_get_interChRatio( gfp ) );
wxPrintf(wxT("Strict ISO Encoding =%s\n"), ( lame_get_strict_ISO( gfp ) ) ?wxT("Yes"):wxT("No"));
wxPrintf(wxT("Scale =%5.2f\n"), lame_get_scale( gfp ) );
wxPrintf(wxT("VBR =%s, VBR_q =%d, VBR method ="),
( lame_get_VBR( gfp ) !=vbr_off ) ? wxT("enabled"): wxT("disabled"),
lame_get_VBR_q( gfp ) );
wxPrintf(wxT("VBR =%s, VBR_q =%d, VBR method ="),
( lame_get_VBR( gfp ) !=vbr_off ) ? wxT("enabled"): wxT("disabled"),
lame_get_VBR_q( gfp ) );
switch ( lame_get_VBR( gfp ) )
{
case vbr_off: wxPrintf(wxT( "vbr_off\n" )); break;
case vbr_mt : wxPrintf(wxT( "vbr_mt \n" )); break;
case vbr_rh : wxPrintf(wxT( "vbr_rh \n" )); break;
case vbr_mtrh: wxPrintf(wxT( "vbr_mtrh \n" )); break;
case vbr_abr:
wxPrintf(wxT( "vbr_abr (average bitrate %d kbps)\n"), lame_get_VBR_mean_bitrate_kbps( gfp ) );
break;
default:
wxPrintf(wxT("error, unknown VBR setting\n"));
break;
}
switch ( lame_get_VBR( gfp ) )
{
case vbr_off: wxPrintf(wxT( "vbr_off\n" )); break;
case vbr_mt : wxPrintf(wxT( "vbr_mt \n" )); break;
case vbr_rh : wxPrintf(wxT( "vbr_rh \n" )); break;
case vbr_mtrh: wxPrintf(wxT( "vbr_mtrh \n" )); break;
case vbr_abr:
wxPrintf(wxT( "vbr_abr (average bitrate %d kbps)\n"), lame_get_VBR_mean_bitrate_kbps( gfp ) );
break;
default:
wxPrintf(wxT("error, unknown VBR setting\n"));
break;
}
wxPrintf(wxT("Vbr Min bitrate =%d kbps\n"), lame_get_VBR_min_bitrate_kbps( gfp ) );
wxPrintf(wxT("Vbr Max bitrate =%d kbps\n"), lame_get_VBR_max_bitrate_kbps( gfp ) );
wxPrintf(wxT("Vbr Min bitrate =%d kbps\n"), lame_get_VBR_min_bitrate_kbps( gfp ) );
wxPrintf(wxT("Vbr Max bitrate =%d kbps\n"), lame_get_VBR_max_bitrate_kbps( gfp ) );
wxPrintf(wxT("Write VBR Header =%s\n"), ( lame_get_bWriteVbrTag( gfp ) ) ?wxT("Yes"):wxT("No"));
wxPrintf(wxT("VBR Hard min =%d\n"), lame_get_VBR_hard_min( gfp ) );
wxPrintf(wxT("Write VBR Header =%s\n"), ( lame_get_bWriteVbrTag( gfp ) ) ?wxT("Yes"):wxT("No"));
wxPrintf(wxT("VBR Hard min =%d\n"), lame_get_VBR_hard_min( gfp ) );
wxPrintf(wxT("ATH Only =%d\n"), lame_get_ATHonly( gfp ) );
wxPrintf(wxT("ATH short =%d\n"), lame_get_ATHshort( gfp ) );
wxPrintf(wxT("ATH no =%d\n"), lame_get_noATH( gfp ) );
wxPrintf(wxT("ATH type =%d\n"), lame_get_ATHtype( gfp ) );
wxPrintf(wxT("ATH lower =%f\n"), lame_get_ATHlower( gfp ) );
wxPrintf(wxT("ATH aa =%d\n"), lame_get_athaa_type( gfp ) );
wxPrintf(wxT("ATH aa loudapprox =%d\n"), lame_get_athaa_loudapprox( gfp ) );
wxPrintf(wxT("ATH aa sensitivity =%f\n"), lame_get_athaa_sensitivity( gfp ) );
wxPrintf(wxT("ATH Only =%d\n"), lame_get_ATHonly( gfp ) );
wxPrintf(wxT("ATH short =%d\n"), lame_get_ATHshort( gfp ) );
wxPrintf(wxT("ATH no =%d\n"), lame_get_noATH( gfp ) );
wxPrintf(wxT("ATH type =%d\n"), lame_get_ATHtype( gfp ) );
wxPrintf(wxT("ATH lower =%f\n"), lame_get_ATHlower( gfp ) );
wxPrintf(wxT("ATH aa =%d\n"), lame_get_athaa_type( gfp ) );
wxPrintf(wxT("ATH aa loudapprox =%d\n"), lame_get_athaa_loudapprox( gfp ) );
wxPrintf(wxT("ATH aa sensitivity =%f\n"), lame_get_athaa_sensitivity( gfp ) );
wxPrintf(wxT("Experimental nspsytune =%d\n"), lame_get_exp_nspsytune( gfp ) );
wxPrintf(wxT("Experimental X =%d\n"), lame_get_experimentalX( gfp ) );
wxPrintf(wxT("Experimental Y =%d\n"), lame_get_experimentalY( gfp ) );
wxPrintf(wxT("Experimental Z =%d\n"), lame_get_experimentalZ( gfp ) );
wxPrintf(wxT("Experimental nspsytune =%d\n"), lame_get_exp_nspsytune( gfp ) );
wxPrintf(wxT("Experimental X =%d\n"), lame_get_experimentalX( gfp ) );
wxPrintf(wxT("Experimental Y =%d\n"), lame_get_experimentalY( gfp ) );
wxPrintf(wxT("Experimental Z =%d\n"), lame_get_experimentalZ( gfp ) );
}
#endif

14
src/export/ExportOGG.cpp
View File

@@ -298,8 +298,8 @@ int ExportOGG::Export(AudacityProject *project,
// so do so (for however many pages are available).
while (!eos) {
int result = ogg_stream_pageout(&stream, &page);
if (!result) {
int result = ogg_stream_pageout(&stream, &page);
if (!result) {
break;
}
@@ -309,7 +309,7 @@ int ExportOGG::Export(AudacityProject *project,
if (ogg_page_eos(&page)) {
eos = 1;
}
}
}
}
}
@@ -320,11 +320,11 @@ int ExportOGG::Export(AudacityProject *project,
delete mixer;
ogg_stream_clear(&stream);
ogg_stream_clear(&stream);
vorbis_block_clear(&block);
vorbis_dsp_clear(&dsp);
vorbis_info_clear(&info);
vorbis_block_clear(&block);
vorbis_dsp_clear(&dsp);
vorbis_info_clear(&info);
vorbis_comment_clear(&comment);
outFile.Close();