Fixed conflicts

lib/rdlistviewitem.cpp

@@ -39,6 +39,20 @@ RDListViewItem::RDListViewItem(Q3ListView *parent)
   }
 }
 
+RDListViewItem::RDListViewItem(RDListViewItem *parent)
+  : Q3ListViewItem((Q3ListViewItem *)parent)
+{
+  item_line=-1;
+  item_id=-1;
+  list_parent=(RDListView *)listView();
+  item_background_color=
+    list_parent->palette().color(QPalette::Active,QColorGroup::Base);
+  for(int i=0;i<list_parent->columns();i++) {
+    item_text_color.
+      push_back(list_parent->palette().color(QPalette::Active,QColorGroup::Text));
+    item_text_weight.push_back(list_parent->font().weight());
+  }
+}
 
 int RDListViewItem::line() const
 {

lib/rdlistviewitem.h

@@ -32,6 +32,7 @@ class RDListViewItem : public Q3ListViewItem
 {
  public:
   RDListViewItem(Q3ListView *parent);
+  RDListViewItem(RDListViewItem *parent);
   int line() const;
   void setLine(int line);
   int id() const;

lib/rdsimpleplayer.cpp

@@ -36,6 +36,7 @@ RDSimplePlayer::RDSimplePlayer(RDCae *cae,RDRipc *ripc,int card,int port,
   play_end_cart=end_cart;
   play_stream=-1;
   play_cart=0;
+  play_cut="";
   play_is_playing=false;
 
   //
@@ -74,12 +75,37 @@ RDSimplePlayer::~RDSimplePlayer()
 }
 
 
+bool RDSimplePlayer::isPlaying()
+{
+  return play_is_playing;
+}
+
+
 void RDSimplePlayer::setCart(unsigned cart)
 {
   play_cart=cart;
 }
 
 
+void RDSimplePlayer::setCart(QString cart)
+{
+  QStringList cartcut=cart.split("_");
+  play_cart=cartcut[0].toUInt();
+  if(cartcut.size()>1) {
+    setCut(cart);
+  }
+  else {
+    play_cut="";
+  }
+}
+
+
+void RDSimplePlayer::setCut(QString cut)
+{
+  play_cut=cut;
+}
+
+
 RDTransportButton *RDSimplePlayer::playButton() const
 {
   return play_start_button;
@@ -112,14 +138,14 @@ void RDSimplePlayer::play(int start_pos)
     stop();
   }
 
-  QString cut = "";
-  RDCart *cart=new RDCart(play_cart);
-  if(cart->selectCut(&cut)) {
-    if(cut.isEmpty()) {
-      return;
-    }
+  if(play_cut.isEmpty()) {
+    RDCart *cart=new RDCart(play_cart);
+    cart->selectCut(&play_cut);
+    delete cart;
+  }
+  if(!play_cut.isEmpty()) {
     play_cae->
-      loadPlay(play_card,cut,&play_stream,&handle);
+      loadPlay(play_card,play_cut,&play_stream,&handle);
 
     if(play_stream<0) {
       return;
@@ -130,7 +156,7 @@ void RDSimplePlayer::play(int start_pos)
       "END_POINT,"+    // 01
       "PLAY_GAIN "+    // 02
       "from CUTS where "+
-      "CUT_NAME=\""+RDEscapeString(cut)+"\"";
+      "CUT_NAME=\""+RDEscapeString(play_cut)+"\"";
     q=new RDSqlQuery(sql);
     if(q->first()) {
       play_cut_gain=q->value(2).toInt(); 
@@ -147,7 +173,6 @@ void RDSimplePlayer::play(int start_pos)
     }
     delete q;
   }
-  delete cart;
 }
 
 

lib/rdsimpleplayer.h

@@ -38,6 +38,9 @@ class RDSimplePlayer : public QWidget
 		 unsigned start_cart,unsigned end_cart,QWidget *parent=0);
   ~RDSimplePlayer();
   void setCart(unsigned cart);
+  void setCart(QString cart);
+  void setCut(QString cart);
+  bool isPlaying();
   RDTransportButton *playButton() const;
   RDTransportButton *stopButton() const;
 
@@ -62,6 +65,7 @@ class RDSimplePlayer : public QWidget
   int play_port;
   std::queue<int> play_handles;
   unsigned play_cart;
+  QString play_cut;
   unsigned play_start_cart;
   unsigned play_end_cart;
   bool play_is_playing;