CharsetDistiller

* Default constructor parameters for CharsetDistiller and
    OutputEncoder
pull/1/head
Andrej Lajovic 2013-11-16 09:17:27 -06:00 zatwierdzone przez David Freese
rodzic ab0a464b17
commit d9030901ea
4 zmienionych plików z 7 dodań i 7 usunięć

Wyświetl plik

@ -395,10 +395,10 @@ Pixmap fldigi_icon_pixmap;
#endif
// for character set conversion
int rxtx_charset = 0;
static CharsetDistiller rx_chd(charset_list[rxtx_charset].tiniconv_id);
static CharsetDistiller echo_chd(charset_list[rxtx_charset].tiniconv_id);
static OutputEncoder tx_encoder(charset_list[rxtx_charset].tiniconv_id);
int rxtx_charset;
static CharsetDistiller rx_chd;
static CharsetDistiller echo_chd;
static OutputEncoder tx_encoder;
Fl_Menu_Item *getMenuItem(const char *caption, Fl_Menu_Item* submenu = 0);
void UI_select();

Wyświetl plik

@ -29,7 +29,7 @@
class CharsetDistiller
{
public:
CharsetDistiller(const int charset_in);
CharsetDistiller(const int charset_in = TINICONV_CHARSET_UTF_8);
int set_input_encoding(const int charset_in);
void rx(const unsigned char c);
void rx(const unsigned char *c);

Wyświetl plik

@ -29,7 +29,7 @@
class OutputEncoder
{
public:
OutputEncoder(const int charset_out, unsigned int buffer_size = 32);
OutputEncoder(const int charset_out = TINICONV_CHARSET_UTF_8, unsigned int buffer_size = 32);
~OutputEncoder(void);
void set_output_encoding(const int charset_out);
void push(std::string s);

Wyświetl plik

@ -81,7 +81,7 @@ pskBrowser::pskBrowser(int x, int y, int w, int h, const char *l)
bline = freqformat(i);
if ( i < progdefaults.VIEWERchannels) add(bline.c_str());
linechars[i] = 0;
new(&cdistiller[i]) CharsetDistiller(rxtx_charset);
new(&cdistiller[i]) CharsetDistiller;
}
nchars = (w - cols[0] - (sbarwidth + 2*BWSR_BORDER)) / cwidth;
nchars = nchars < 1 ? 1 : nchars;