p_intf->p_sys->p_text->p_module =
module_Need( p_intf->p_sys->p_text, "text renderer", 0, 0 );
}
- if( psz_modulename ) free( psz_modulename );
+ free( psz_modulename );
if( !p_intf->p_sys->p_text->p_module )
return VLC_EGENERIC;
static void DeAllocatePicture( vlc_object_t *p_this, picture_t *p_pic,
video_format_t *p_fmt )
{
- if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
- if( p_pic && p_pic->pf_release ) p_pic->pf_release( p_pic );
- if( p_fmt && p_fmt->p_palette )
+ if( p_pic )
+ {
+ free( p_pic->p_data_orig );
+ if( p_pic->pf_release ) p_pic->pf_release( p_pic );
+ }
+ if( p_fmt )
{
free( p_fmt->p_palette );
p_fmt->p_palette = NULL;
[self setupVarMenu: o_menu forMenuItem: o_mi target:p_object
var:psz_variable selector:pf_callback];
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
return;
}
break;
default:
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
return;
}
if( ( i_type & VLC_VAR_TYPE ) == VLC_VAR_STRING ) free( val.psz_string );
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
}
- (void)dealloc
{
if( o_label ) [o_label release];
- if( psz_name ) free( psz_name );
+ free( psz_name );
[super dealloc];
}
for( i = 0; i < p_sys->i_dir_entries; i++ )
{
struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i];
- if( p_dir_entry->psz_path ) free( p_dir_entry->psz_path );
+ free( p_dir_entry->psz_path );
REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, i );
- if( p_dir_entry ) free( p_dir_entry );
+ free( p_dir_entry );
}
p_sys->pp_dir_entries = NULL;
- if( p_sys->psz_current_dir ) free( p_sys->psz_current_dir );
- if( p_sys->psz_search_chain ) free( p_sys->psz_search_chain );
- if( p_sys->psz_old_search ) free( p_sys->psz_old_search );
- if( p_sys->psz_open_chain ) free( p_sys->psz_open_chain );
+ free( p_sys->psz_current_dir );
+ free( p_sys->psz_search_chain );
+ free( p_sys->psz_old_search );
+ free( p_sys->psz_open_chain );
if( p_sys->p_input )
{
break;
}
}
- if( p_sys->psz_old_search )
- {
- free( p_sys->psz_old_search );
- p_sys->psz_old_search = NULL;
- }
+ free( p_sys->psz_old_search );
+ p_sys->psz_old_search = NULL;
SearchPlaylist( p_intf, p_sys->psz_search_chain );
return 1;
}
intf_Eject( p_intf, psz_device );
}
- free(psz_device);
+ free( psz_device );
return;
}
// this, like the one behind the refresh push button?
p_module_config->b_dirty = VLC_FALSE;
- if(val.psz_string) free(val.psz_string);
+ free( val.psz_string );
}
finish( p_module_config, bycat );
if( ( p_dialog->i_flags & DIALOG_INTF_PROGRESS ) &&
( p_dialog->val.f_float >= 100.0 ) )
progressBar->hide();
+ if( ( p_dialog->i_flags & DIALOG_USER_PROGRESS ) &&
+ ( p_dialog->val.f_float >= 100.0 ) )
+ altButton->setText( qtr( "close" ) );
}
InteractionDialog::~InteractionDialog()
NOTCOMMAND && val.psz_string &&
!strcmp( val.psz_string, CURVAL.psz_string ) );
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
break;
case VLC_VAR_INTEGER:
}
virtual ~MenuItemData()
{
- if( psz_var ) free( psz_var );
- if( ((i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING)
- && val.psz_string ) free( val.psz_string );
+ free( psz_var );
+ if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
+ free( val.psz_string );
}
int i_object_id;
int i_val_type;
// Show the windows
pNewTheme->getWindowManager().showAll( true );
}
- if( skin_last ) free( skin_last );
+ free( skin_last );
// The new theme cannot embed a video output yet
VlcProc::instance( getIntf() )->dropVout();
}
free( p_arg->psz_results );
}
- if( p_arg->psz_title ) free( p_arg->psz_title );
- if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
+ free( p_arg->psz_title );
+ free( p_arg->psz_extensions );
free( p_arg );
}
AppendMenu( hMenu, MF_STRING | MF_POPUP, (UINT)hMenuItem,
_FROMMB(text.psz_string ? text.psz_string : psz_var) );
if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
return;
}
break;
default:
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
return;
}
if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING ) free( val.psz_string );
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
}
HMENU CreateChoicesMenu( intf_thread_t *p_intf,
MenuItemExt::~MenuItemExt()
{
- if( psz_var ) free( psz_var );
- if( ((i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING)
- && val.psz_string ) free( val.psz_string );
+ free( psz_var );
+ if( ( i_val_type & VLC_VAR_TYPE ) == VLC_VAR_STRING )
+ free( val.psz_string );
};
void MenuItemExt::ClearList( vector<MenuItemExt*> *p_menu_list )
sz_subsfile += psz_subsfile;
subsfile_mrl.push_back( sz_subsfile );
}
- if( psz_subsfile ) free( psz_subsfile );
+ free( psz_subsfile );
}
void OpenDialog::NetPanel( HWND hwnd )
ConfigTreeData() { b_submodule = 0; panel = NULL; psz_section = NULL;
psz_help = NULL; }
- virtual ~ConfigTreeData() { if( panel ) delete panel;
- if( psz_section) free(psz_section);
- if( psz_help) free(psz_help); }
+ virtual ~ConfigTreeData() { delete panel;
+ free( psz_section );
+ free( psz_help ); }
vlc_bool_t b_submodule;
10, 10 + 15 + 10 - 3, rcClient.right - 2*10, 5*15 + 6,
hwnd, NULL, hInst, NULL );
- if( psz_subsfile ) free( psz_subsfile );
+ free( psz_subsfile );
browse_button = CreateWindow( _T("BUTTON"), _T("Browse..."),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
}
free( p_arg->psz_results );
}
- if( p_arg->psz_title ) free( p_arg->psz_title );
- if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
+ free( p_arg->psz_title );
+ free( p_arg->psz_extensions );
free( p_arg );
}
}
void BookmarkEditDialog::OnOK( wxCommandEvent &event )
{
- if( p_seekpoint->psz_name ) free( p_seekpoint->psz_name );
+ free( p_seekpoint->psz_name );
p_seekpoint->psz_name = strdup( name_text->GetValue().mb_str(wxConvUTF8) );
p_seekpoint->i_byte_offset = atoi( bytes_text->GetValue().mb_str(wxConvUTF8) );
p_seekpoint->i_time_offset = 1000000 *
sout_button->Enable();
subsfile_mrl.Add( wxString(wxT("sout=")) + wxL2U(psz_sout) );
}
- if( psz_sout ) free( psz_sout );
+ free( psz_sout );
common_opt_sizer->Add( sout_button, 1, wxALIGN_LEFT |
wxALIGN_CENTER_VERTICAL );
0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
subfile_combo = new wxComboBox( panel, SubFileName_Event,
wxL2U( psz_subsfile ) );
- if( psz_subsfile ) free( psz_subsfile );
+ free( psz_subsfile );
subbrowse_button = new wxButton( panel, SubFileBrowse_Event,
wxU(_("Browse...")) );
subfile_sizer->Add( subfile_combo, 1, wxALL | wxALIGN_CENTER_VERTICAL, 5 );
break;
}
- free(psz_device);
+ free( psz_device );
disc_probe->SetValue(FALSE);
UpdateMRL( DISC_ACCESS );
disc_title->SetValue( 0 ); i_disc_title = 0;
disc_chapter->SetValue( 0 ); i_disc_chapter = 0;
- if( psz_device ) free( psz_device );
+ free( psz_device );
UpdateMRL( DISC_ACCESS );
}
ConfigTreeData() { b_submodule = 0; panel = NULL; psz_name = NULL;
psz_help = NULL; }
virtual ~ConfigTreeData() {
- if( panel ) delete panel;
- if( psz_name ) free( psz_name );
- if( psz_help ) free( psz_help );
+ delete panel;
+ free( psz_name );
+ free( psz_help );
};
vlc_bool_t b_submodule;
GetItemData( current_item );
cd->i_type = TYPE_CATSUBCAT;
cd->i_subcat_id = p_item->value.i;
- if( cd->psz_name ) free( cd->psz_name );
+ free( cd->psz_name );
cd->psz_name = strdup( config_CategoryNameGet(
p_item->value.i ) );
- if( cd->psz_help ) free( cd->psz_help );
+ free( cd->psz_help );
const char *psz_help = config_CategoryHelpGet( p_item->value.i );
if( psz_help )
{
// this, like the one behind the refresh push button?
p_module_config->b_dirty = VLC_FALSE;
- if(val.psz_string) free(val.psz_string);
+ free( val.psz_string );
}
UpdateCombo( p_module_config );
StringListConfigControl::~StringListConfigControl()
{
- if( psz_default_value ) free( psz_default_value );
+ free( psz_default_value );
}
void StringListConfigControl::UpdateCombo( module_config_t *p_item )
if( !psz_subsfile ) psz_subsfile = strdup("");
file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
wxPoint(20,25), wxSize(300, -1) );
- if( psz_subsfile ) free( psz_subsfile );
+ free( psz_subsfile );
wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
wxU(_("Browse...")) );
file_sizer->Add( file_combo, 1, wxALL, 5 );
wizTranscodeCodecPage::~wizTranscodeCodecPage()
{
- if( acodec ) free( acodec );
- if( vcodec ) free( vcodec );
+ free( acodec );
+ free( vcodec );
}
void wizTranscodeCodecPage::OnEnableVideo(wxCommandEvent& event)
":sout=#%smux=%s,dst=%s%s%s%s}", method,
mux, v6 ? "[" : "", address, v6 ? "]" : "",
psz_sap_option ?: "" );
- if( psz_sap_option ) free( psz_sap_option );
+ free( psz_sap_option );
}
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
CreateChoicesMenu( psz_var, p_object, TRUE ),
wxT("")/* Nothing for now (maybe use a GETLONGTEXT) */ );
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
return;
}
break;
}
- if( text.psz_string ) free( text.psz_string );
+ free( text.psz_string );
}
wxMenu *Menu::CreateChoicesMenu( const char *psz_var, vlc_object_t *p_object,
val_list.p_list->p_values[i].psz_string ) )
menu->Check( i_item_id, TRUE );
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
break;
case VLC_VAR_INTEGER:
wxMenuItemExt::~wxMenuItemExt()
{
- if( psz_var ) free( psz_var );
- if( ((i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING)
- && val.psz_string ) free( val.psz_string );
+ free( psz_var );
+ if( ( i_val_type & VLC_VAR_TYPE ) == VLC_VAR_STRING )
+ free( val.psz_string );
};
}
}
- if( psz_org ) free( psz_org );
+ free( psz_org );
return;
invalid:
position[i] = wxDefaultPosition;
size[i] = wxDefaultSize;
}
- if( psz_org ) free( psz_org );
+ free( psz_org );
}