adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some cleanup with the open() / close() functions

This commit is contained in:
darkeye 2002-10-19 13:31:46 +00:00
parent a83e8c8c7a
commit d4244515ae
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
darkice/trunk/src/LameLibEncoder.cpp
View File

@ -70,6 +70,12 @@ LameLibEncoder :: open ( void )
close(); close();
} }
// open the underlying sink
if ( !sink->open() ) {
throw Exception( __FILE__, __LINE__,
"lame lib opening underlying sink error");
}
lameGlobalFlags = lame_init(); lameGlobalFlags = lame_init();
// ugly lame returns -1 in a pointer on allocation errors // ugly lame returns -1 in a pointer on allocation errors
@ -246,12 +252,6 @@ LameLibEncoder :: open ( void )
lame_print_config( lameGlobalFlags); lame_print_config( lameGlobalFlags);
// open the underlying sink
if ( !sink->open() ) {
throw Exception( __FILE__, __LINE__,
"lame lib opening underlying sink error");
}
return true; return true;
} }
@ -372,6 +372,8 @@ LameLibEncoder :: close ( void ) throw ( Exception )
flush(); flush();
lame_close( lameGlobalFlags); lame_close( lameGlobalFlags);
lameGlobalFlags = 0; lameGlobalFlags = 0;
sink->close();
} }
} }
@ -384,6 +386,9 @@ LameLibEncoder :: close ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.18 2002/10/19 13:31:46 darkeye
some cleanup with the open() / close() functions
Revision 1.17 2002/10/19 12:22:10 darkeye Revision 1.17 2002/10/19 12:22:10 darkeye
return 0 immediately for write() if supplied length is 0 return 0 immediately for write() if supplied length is 0

17
darkice/trunk/src/VorbisLibEncoder.cpp
View File

@ -121,6 +121,12 @@ VorbisLibEncoder :: open ( void )
close(); close();
} }
// open the underlying sink
if ( !sink->open() ) {
throw Exception( __FILE__, __LINE__,
"vorbis lib opening underlying sink error");
}
vorbis_info_init( &vorbisInfo); vorbis_info_init( &vorbisInfo);
switch ( getOutBitrateMode() ) { switch ( getOutBitrateMode() ) {
@ -180,12 +186,6 @@ VorbisLibEncoder :: open ( void )
throw Exception( __FILE__, __LINE__, "ogg stream init error", ret); throw Exception( __FILE__, __LINE__, "ogg stream init error", ret);
} }
// open the underlying sink
if ( !sink->open() ) {
throw Exception( __FILE__, __LINE__,
"vorbis lib opening underlying sink error");
}
// create an empty vorbis_comment structure // create an empty vorbis_comment structure
vorbis_comment_init( &vorbisComment); vorbis_comment_init( &vorbisComment);
@ -356,6 +356,8 @@ VorbisLibEncoder :: close ( void ) throw ( Exception )
vorbis_info_clear( &vorbisInfo); vorbis_info_clear( &vorbisInfo);
encoderOpen = false; encoderOpen = false;
sink->close();
} }
} }
@ -368,6 +370,9 @@ VorbisLibEncoder :: close ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.16 2002/10/19 13:31:46 darkeye
some cleanup with the open() / close() functions
Revision 1.15 2002/10/19 12:22:10 darkeye Revision 1.15 2002/10/19 12:22:10 darkeye
return 0 immediately for write() if supplied length is 0 return 0 immediately for write() if supplied length is 0