Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 14:43:30 +02:00
Code Issues Projects Releases Wiki Activity

2021-01-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Reenabled cart dragging in rdlibrary(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-01-14 17:55:17 -05:00
parent 1a8ec199a8
commit 2934b80f26
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -20786,3 +20786,5 @@
* Renamed the 'RDEmptyCart' widget to 'RD3EmptyCart'.
2021-01-14 Fred Gleason <fredg@paravelsystems.com>
* Reenabled cart dragging in rdlibrary(1).
2021-01-14 Fred Gleason <fredg@paravelsystems.com>
* Purged unneeded data structures in rdlibrary(1).

14
rdlibrary/rdlibrary.cpp
View File

@ -57,10 +57,7 @@ void SigHandler(int signo);
//
// Icons
//
#include "../icons/play.xpm"
#include "../icons/rml5.xpm"
#include "../icons/track_cart.xpm"
#include "../icons/rdlibrary-22x22.xpm"
#include "../icons/rivendell-22x22.xpm"
MainWidget::MainWidget(RDConfig *c,QWidget *parent)
: RDWidget(c,parent)
@ -85,11 +82,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
// Create Icons
//
lib_playout_map=new QPixmap(play_xpm);
lib_macro_map=new QPixmap(rml5_xpm);
lib_track_cart_map=new QPixmap(track_cart_xpm);
lib_rivendell_map=new QPixmap(rdlibrary_22x22_xpm);
setWindowIcon(*lib_rivendell_map);
setWindowIcon(QPixmap(rivendell_22x22_xpm));
//
// Progress Dialog
@ -136,7 +129,6 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
// Allocate Global Resources
//
lib_filter_mode=rda->station()->filterMode();
rdaudioport_conf=new RDAudioPort(rda->config()->stationName(),
rda->libraryConf()->inputCard());
connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
@ -907,7 +899,7 @@ bool MainWidget::UnlockUser()
//
// Process Deleted Carts
//
for(unsigned i=0;i<lib_deleted_carts.size();i++) {
for(int i=0;i<lib_deleted_carts.size();i++) {
lib_cart_model->removeCart(lib_deleted_carts.at(i));
}
lib_deleted_carts.clear();

10
rdlibrary/rdlibrary.h
View File

@ -100,12 +100,6 @@ class MainWidget : public RDWidget
LibraryView *lib_cart_view;
RDLibraryModel *lib_cart_model;
QString lib_filter_text;
QString lib_search_text;
QPixmap *lib_playout_map;
QPixmap *lib_macro_map;
QPixmap *lib_track_cart_map;
QPushButton *lib_search_button;
QPushButton *lib_clear_button;
QPushButton *lib_add_button;
QPushButton *lib_edit_button;
QPushButton *lib_delete_button;
@ -119,15 +113,13 @@ class MainWidget : public RDWidget
int lib_output_port;
QString lib_default_group;
QString lib_import_path;
QPixmap *lib_rivendell_map;
RDStation::FilterMode lib_filter_mode;
QProgressDialog *lib_progress_dialog;
bool profile_ripping;
bool lib_edit_pending;
bool lib_user_changed;
QTimer *lib_user_timer;
bool lib_resize;
std::vector<unsigned> lib_deleted_carts;
QList<unsigned> lib_deleted_carts;
};