fixed citation and added our second presentation

presentation/Makefile

@@ -13,7 +13,7 @@ endif
 all: main.pdf
 
 FLAGS = -pdf -pdflatex="xelatex" -use-make \
-	-quiet -synctex=1
+	-quiet -synctex=1 -bibtex
 
 main.pdf: main.tex
 	latexmk $(FLAGS) main.tex $(PDFVIEW)

presentation/cites.bib

@@ -1,19 +1,4 @@
-@article { robust,
-<<<<<<< HEAD
-=======
-author = "Julien Pinquier, Jean-Luc Rouas and Régine André-Obrecht",
->>>>>>> 9840d5f98437e155f3cd7fd430f31db16441f777
-title = "ROBUST SPEECH/MUSIC CLASSIFICATION IN AUDIO DOCUMENTS",
-author = "Julien Pinquier, Jean-Luc Rouas and Régine André-Obrecht",
-journal = "7th International Conference on Spoken Language Processing [ICSLP2002]",
-year = "2002"
-}
-
 @article { mirex,
-<<<<<<< HEAD
-=======
-author = "Nikolaos Tsipas, Lazaros Vrysis, Charalampos Dimoulas and George Papanikolaou",
->>>>>>> 9840d5f98437e155f3cd7fd430f31db16441f777
 title = "MIREX 2015: METHODS FOR SPEECH/MUSIC DETECTION AND CLASSIFICATION",
 author = "Nikolaos Tsipas, Lazaros Vrysis, Charalampos Dimoulas and George Papanikolaou",
 journal = "MIREX 2015 Conference",
@@ -21,10 +6,6 @@ year = "2015"
 }
 
 @article { speech,
-<<<<<<< HEAD
-=======
-author = "Baniriskhem K. Khonglah and S.R. Mahadeva Prasanna",
->>>>>>> 9840d5f98437e155f3cd7fd430f31db16441f777
 title = "Speech / music classification using speech-specific features",
 author = "Baniriskhem K. Khonglah and S.R. Mahadeva Prasanna",
 journal = "Digital Signal Processing 48",
@@ -38,59 +19,45 @@ journal = "2nd IEEE International Conference on Computational Intelligence and A
 year = "2017"
 }
 
-@article { hybrid,
-author = " Kun-Ching Wang,  Yung-Ming Yang and Ying-Ru Yang",
-title = "Speech/music discrimination using hybrid-based feature extraction for audio data indexing",
-journal = " 2017 International Conference on System Science and Engineering (ICSSE)",
-year = "2017"
-}
-
 @article{ radio,
 title = "Speech/music discrimination for analysis of radio stations",
 author = "Stanisław Kacprzak, Błażej Chwiećko and Bartosz Ziółko",
 journal = "2017 International Conference on Systems, Signals and Image Processing (IWSSIP)",
 year = "2017"
-<<<<<<< HEAD
 }
 
-<<<<<<< HEAD
-@article { speech,
-title = "Speech / music classification using speech-specific features",
-author = "Baniriskhem K. Khonglah and S.R. Mahadeva Prasanna",
-journal = "Digital Signal Processing 48",
-year = "2016"
-)
-
-@article { robust
-title = "ROBUST SPEECH / MUSIC CLASSIFICATION IN AUDIO DOCUMENTS"
-author = "Julien PINQUIER, Jean-Luc ROUAS and R´ egine ANDRE-OBRECHT"
-journal = "7^{th} International Conference on Spoken Language Processing"
-year = "2002"
-}
-
-@article { mirex
-title = "METHODS FOR SPEECH / MUSIC DETECTION AND CLASSIFICATION"
-author = "Nikolaos Tsipas Lazaros Vrysis Charalampos Dimoulas George Papanikolaou"
-journal = "MIREX"
-year = "2015"
-}
-
-@article { hybrid
-title = "Speech/Music Discrimination using Hybrid-Based Feature Extraction for Audio Data Indexing"
-author = "Kun-Ching, Wang, Member, IEEE, Yung-Ming, Yang and Ying-Ru, Yang"
-journal = "2017 International Conference on System Science and Engineering (ICSSE)"
-year = "2017"
-}
-
-
-=======
-@article { hybrid,
-autor = " Kun-Ching Wang,  Yung-Ming Yang and Ying-Ru Yang",
-title = "Speech/music discrimination using hybrid-based feature extraction for audio data indexing",
-journal = " 2017 International Conference on System Science and Engineering (ICSSE)",
-year = "2017"
-}
->>>>>>> 7e0fde228c5c02314be28f60d4c807791c1e2763
-=======
-}
->>>>>>> 9840d5f98437e155f3cd7fd430f31db16441f777
+@article { robust,
+title = "ROBUST SPEECH / MUSIC CLASSIFICATION IN AUDIO DOCUMENTS",
+author = "Julien PINQUIER, Jean-Luc ROUAS and R´ egine ANDRE-OBRECHT",
+journal = "7^{th} International Conference on Spoken Language Processing",
+year = "2002",
+}
+
+@INPROCEEDINGS{ hybrid, 
+author={K. Wang and Y. Yang and Y. Yang},
+booktitle={2017 International Conference on System Science and
+                  Engineering (ICSSE)},
+title={Speech/music discrimination using hybrid-based feature
+                  extraction for audio data indexing},
+year={2017},
+volume={},
+number={},
+pages={515-519},
+keywords={audio recording;audio signal processing;feature
+                  extraction;music;pattern classification;signal
+                  classification;speech processing;speech/music
+                  discrimination;feature extraction;audio data
+                  indexing;hybrid manner;noisy audio
+                  signal;hybrid-based SMD;1D signal processing;2D
+                  image processing;noisy audio
+                  segment;pre-processing/voice activity
+                  detection;audio recording stream;speech
+                  segments;music segments;Speech;Spectrogram;Feature
+                  extraction;Noise measurement;Gray-scale;Two
+                  dimensional displays;Image segmentation;spectrogram
+                  image;speech/music classification;wavelet
+                  packet;support vector machine;hybrid-based feature
+                  extraction},
+doi={10.1109/ICSSE.2017.8030927},
+ISSN={2325-0925},
+month={July},}

presentation/main.tex

@@ -54,6 +54,5 @@
 
   \bibliographystyle{ieeetr}
   \bibliography{cites}{}
-  \bibliographystyle{plain}
 
 \end{document}